merge

--HG--
branch : product-engine

1 files changed, 5 insertions, 2 deletions

diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 3c34ba32e2..082b7a9468 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -402,9 +402,12 @@ void LLInventoryPanel::modelChanged(U32 mask)
 // static
 void LLInventoryPanel::onIdle(void *userdata)
 {
+	if (!gInventory.isInventoryUsable())
+		return;
+
 	LLInventoryPanel *self = (LLInventoryPanel*)userdata;
 	// Inventory just initialized, do complete build
-	if (!self->mViewsInitialized && gInventory.isInventoryUsable())
+	if (!self->mViewsInitialized)
 	{
 		self->initializeViews();
 	}
@@ -502,7 +505,7 @@ void LLInventoryPanel::buildNewViews(const LLUUID& id)
 				// but still have the parent folder present for listener-related operations.
 				if (id == mStartFolderID)
 				{
-					folderp->setDontShowInHierarchy(TRUE);
+					folderp->setHidden(TRUE);
 				}
 			}
 		}