1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp
index 85b4259a29..0ca5938c97 100644
--- a/indra/newview/llpaneloutfitedit.cpp
+++ b/indra/newview/llpaneloutfitedit.cpp
@@ -311,7 +311,6 @@ BOOL LLPanelOutfitEdit::postBuild()
 
 	mWearableItemsPanel = getChild<LLPanel>("filtered_wearables_panel");
 	mWearableItemsList = getChild<LLInventoryItemsList>("filtered_wearables_list");
-	mWearableListManager = new LLFilteredWearableListManager(mWearableItemsList, mWearableListMaskCollector);
 
 	mSaveComboBtn.reset(new LLSaveOutfitComboBtn(this));
 	return TRUE;
@@ -322,6 +321,9 @@ void LLPanelOutfitEdit::onOpen(const LLSD& key)
 {
 	if (!mInitialized)
 	{
+		// *TODO: this method is called even panel is not visible to user because its parent layout panel is hidden.
+		// So, we can defer initializing a bit.
+		mWearableListManager = new LLFilteredWearableListManager(mWearableItemsList, mWearableListMaskCollector);
 		displayCurrentOutfit();
 		mInitialized = true;
 	}