diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2010-05-31 17:46:50 +0300 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-05-31 17:46:50 +0300 |
| commit | 325729b739475b5c6b4227f4d1951a70cb9d7028 (patch) | |
| tree | 19705a6335db5145316ee6b69193ef4b7f070c25 /indra | |
| parent | 4b8c269d9495718207e58c22c991894aa375e497 (diff) | |
EXT-7485 ADDITIONAL FIX Fixed crash at viewer exit
used raw pointer instead of auto_ptr, since lifetime of mSaveMenu field controlled by parent gMenuHolder
--HG--
branch : product-engine
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llsaveoutfitcombobtn.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/llsaveoutfitcombobtn.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llsaveoutfitcombobtn.cpp b/indra/newview/llsaveoutfitcombobtn.cpp index 85197853de..b9b577084b 100644 --- a/indra/newview/llsaveoutfitcombobtn.cpp +++ b/indra/newview/llsaveoutfitcombobtn.cpp @@ -53,9 +53,9 @@ LLSaveOutfitComboBtn::LLSaveOutfitComboBtn(LLPanel* parent, bool saveAsDefaultAc mParent->childSetAction(SAVE_BTN, boost::bind(&LLSaveOutfitComboBtn::saveOutfit, this, mSaveAsDefaultAction)); mParent->childSetAction(SAVE_FLYOUT_BTN, boost::bind(&LLSaveOutfitComboBtn::showSaveMenu, this)); - mSaveMenu.reset(LLUICtrlFactory::getInstance()->createFromFile< + mSaveMenu = LLUICtrlFactory::getInstance()->createFromFile< LLToggleableMenu> ("menu_save_outfit.xml", gMenuHolder, - LLViewerMenuHolderGL::child_registry_t::instance())); + LLViewerMenuHolderGL::child_registry_t::instance()); } void LLSaveOutfitComboBtn::showSaveMenu() @@ -64,7 +64,7 @@ void LLSaveOutfitComboBtn::showSaveMenu() LLUI::getMousePositionLocal(mParent, &x, &y); mSaveMenu->updateParent(LLMenuGL::sMenuContainer); - LLMenuGL::showPopup(mParent, mSaveMenu.get(), x, y); + LLMenuGL::showPopup(mParent, mSaveMenu, x, y); } void LLSaveOutfitComboBtn::saveOutfit(bool as_new) diff --git a/indra/newview/llsaveoutfitcombobtn.h b/indra/newview/llsaveoutfitcombobtn.h index d505c4bebe..fec7122194 100644 --- a/indra/newview/llsaveoutfitcombobtn.h +++ b/indra/newview/llsaveoutfitcombobtn.h @@ -54,7 +54,7 @@ public: private: bool mSaveAsDefaultAction; LLPanel* mParent; - std::auto_ptr<LLToggleableMenu> mSaveMenu; + LLToggleableMenu* mSaveMenu; }; #endif // LL_LLSAVEOUTFITCOMBOBTN_H |