1 files changed, 33 insertions, 13 deletions

diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index f96750fb0b..74d9e895c2 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -154,7 +154,8 @@ LLInventoryPanel::LLInventoryPanel(const LLInventoryPanel::Params& p) :
 	mShowEmptyMessage(p.show_empty_message),
 	mSuppressFolderMenu(p.suppress_folder_menu),
 	mSuppressOpenItemAction(false),
-	mViewsInitialized(false),
+	mBuildViewsOnInit(p.preinitialize_views),
+	mViewsInitialized(VIEWS_UNINITIALIZED),
 	mInvFVBridgeBuilder(NULL),
 	mInventoryViewModel(p.name),
 	mGroupedItemBridge(new LLFolderViewGroupedItemBridge)
@@ -281,14 +282,22 @@ void LLInventoryPanel::initFromParams(const LLInventoryPanel::Params& params)
 	mCompletionObserver = new LLInvPanelComplObserver(boost::bind(&LLInventoryPanel::onItemsCompletion, this));
 	mInventory->addObserver(mCompletionObserver);
 
-	// Build view of inventory if we need default full hierarchy and inventory ready, otherwise do in onIdle.
-	// Initializing views takes a while so always do it onIdle if viewer already loaded.
-	if (mInventory->isInventoryUsable() && !mViewsInitialized && LLStartUp::getStartupState() <= STATE_WEARABLES_WAIT)
-	{
-		initializeViews();
-	}
-	
-	gIdleCallbacks.addFunction(onIdle, (void*)this);
+    if (mBuildViewsOnInit)
+    {
+        // Build view of inventory if we need default full hierarchy and inventory is ready, otherwise do in onIdle.
+        // Initializing views takes a while so always do it onIdle if viewer already loaded.
+        if (mInventory->isInventoryUsable()
+            && mViewsInitialized == VIEWS_UNINITIALIZED
+            && LLStartUp::getStartupState() <= STATE_WEARABLES_WAIT)
+        {
+            initializeViews();
+        }
+        else if (mViewsInitialized != VIEWS_INITIALIZING)
+        {
+            mViewsInitialized = VIEWS_INITIALIZING;
+            gIdleCallbacks.addFunction(onIdle, (void*)this);
+        }
+    }
 
 	if (mSortOrderSetting != INHERIT_SORT_ORDER)
 	{
@@ -334,6 +343,17 @@ LLInventoryPanel::~LLInventoryPanel()
     clearFolderRoot();
 }
 
+/*virtual*/
+void LLInventoryPanel::onVisibilityChange(BOOL new_visibility)
+{
+    if (new_visibility && mViewsInitialized == VIEWS_UNINITIALIZED)
+    {
+        mViewsInitialized = VIEWS_INITIALIZING;
+        gIdleCallbacks.addFunction(onIdle, (void*)this);
+    }
+    LLPanel::onVisibilityChange(new_visibility);
+}
+
 void LLInventoryPanel::draw()
 {
 	// Select the desired item (in case it wasn't loaded when the selection was requested)
@@ -657,7 +677,7 @@ void LLInventoryPanel::modelChanged(U32 mask)
 {
 	LL_RECORD_BLOCK_TIME(FTM_REFRESH);
 
-	if (!mViewsInitialized) return;
+	if (mViewsInitialized != VIEWS_INITIALIZED) return;
 	
 	const LLInventoryModel* model = getModel();
 	if (!model) return;
@@ -723,11 +743,11 @@ void LLInventoryPanel::onIdle(void *userdata)
 
 	LLInventoryPanel *self = (LLInventoryPanel*)userdata;
 	// Inventory just initialized, do complete build
-	if (!self->mViewsInitialized)
+	if (self->mViewsInitialized != VIEWS_INITIALIZED)
 	{
 		self->initializeViews();
 	}
-	if (self->mViewsInitialized)
+	if (self->mViewsInitialized == VIEWS_INITIALIZED)
 	{
 		gIdleCallbacks.deleteFunction(onIdle, (void*)self);
 	}
@@ -810,7 +830,7 @@ void LLInventoryPanel::initializeViews()
 
 	gIdleCallbacks.addFunction(idle, this);
 
-	mViewsInitialized = true;
+	mViewsInitialized = VIEWS_INITIALIZED;
 	
 	openStartFolderOrMyInventory();