From 325729b739475b5c6b4227f4d1951a70cb9d7028 Mon Sep 17 00:00:00 2001 From: Alexei Arabadji Date: Mon, 31 May 2010 17:46:50 +0300 Subject: 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 --- indra/newview/llsaveoutfitcombobtn.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/llsaveoutfitcombobtn.cpp') 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) -- cgit v1.2.3