From e9eff2b00975a753217d75437ffd89b62e96227b Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Fri, 25 Mar 2011 10:51:06 -0700
Subject: [PATCH] SOCIAL-808 FIX Crash on exit in LLMediaCtrl
---
indra/newview/llmediactrl.cpp | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp
index 0199958c623..2ed4e136b95 100644
--- a/indra/newview/llmediactrl.cpp
+++ b/indra/newview/llmediactrl.cpp
@@ -153,8 +153,6 @@ LLMediaCtrl::LLMediaCtrl( const Params& p) :
LLMediaCtrl::~LLMediaCtrl()
{
- delete mContextMenu;
-
if (mMediaSource)
{
mMediaSource->remObserver( this );
@@ -389,8 +387,8 @@ void LLMediaCtrl::onFocusLost()
//
BOOL LLMediaCtrl::postBuild ()
{
- mContextMenu = LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu>(
- "menu_media_ctrl.xml", LLMenuGL::sMenuContainer, LLViewerMenuHolderGL::child_registry_t::instance());
+ mContextMenu = LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu>(
+ "menu_media_ctrl.xml", LLMenuGL::sMenuContainer, LLViewerMenuHolderGL::child_registry_t::instance());
setVisibleCallback(boost::bind(&LLMediaCtrl::onVisibilityChange, this, _2));
return TRUE;
}
--
GitLab