summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorVadim ProductEngine <vsavchuk@productengine.com>2010-10-25 21:38:22 +0300
committerVadim ProductEngine <vsavchuk@productengine.com>2010-10-25 21:38:22 +0300
commitba0d4ccaf49753bd8c3eca127d41fa7072782473 (patch)
tree209e02063982f6faa2d34f68ded12bcf38eb63bc /indra/newview
parentde6f7e19c44d267d3224c56941c2ab27677c406f (diff)
STORM-341 FIXED Crash on exiting viewer while Outfit Editor is opened in detached Appearance SP.
Reason: An inventory observer (LLFilteredWearableListManager) tried to use a deleted collect functor (LLFilterItem::collector in LLPanelOutfitEdit::mListViewItemTypes). Fix: De-register (and delete) the observer when the collector gets deleted.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llpaneloutfitedit.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp
index 5638374178..63076364bc 100644
--- a/indra/newview/llpaneloutfitedit.cpp
+++ b/indra/newview/llpaneloutfitedit.cpp
@@ -404,6 +404,7 @@ LLPanelOutfitEdit::LLPanelOutfitEdit()
mAddWearablesPanel(NULL),
mFolderViewFilterCmbBox(NULL),
mListViewFilterCmbBox(NULL),
+ mWearableListManager(NULL),
mPlusBtn(NULL),
mWearablesGearMenuBtn(NULL),
mGearMenuBtn(NULL)
@@ -431,6 +432,7 @@ LLPanelOutfitEdit::LLPanelOutfitEdit()
LLPanelOutfitEdit::~LLPanelOutfitEdit()
{
+ delete mWearableListManager;
delete mSavedFolderState;
delete mCOFDragAndDropObserver;