diff options
| author | callum <none@none> | 2011-03-25 10:51:06 -0700 |
|---|---|---|
| committer | callum <none@none> | 2011-03-25 10:51:06 -0700 |
| commit | e9eff2b00975a753217d75437ffd89b62e96227b (patch) | |
| tree | bc6fb1824117dddbc018d93bd8a53c846c97e051 /indra/newview | |
| parent | 5f224ed8ab527a14a7596adc65876177301aef30 (diff) | |
SOCIAL-808 FIX Crash on exit in LLMediaCtrl
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llmediactrl.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp index 0199958c62..2ed4e136b9 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; } |