From 1e65ba1f909604b027cb7dee5631f698a9f550a8 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Thu, 26 Jul 2012 18:57:54 -0700
Subject: CHUI-251: Adding back in the root 'Contents' folder under the Build
 floater Content tab.

---
 indra/newview/llpanelobjectinventory.cpp       | 25 +++++++++++++++++--------
 indra/newview/skins/default/xui/en/strings.xml |  3 ---
 2 files changed, 17 insertions(+), 11 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index fe1ff01bc2..5887f4d244 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -1656,13 +1656,9 @@ void LLPanelObjectInventory::updateInventory()
 		if (inventory_root)
 		{
 			reset();
-			mIsInventoryEmpty = contents.empty();
-			if (!mIsInventoryEmpty)
-			{
-
-				createFolderViews(inventory_root, contents);
-				mFolders->setEnabled(TRUE);
-			}
+			mIsInventoryEmpty = FALSE;
+			createFolderViews(inventory_root, contents);
+			mFolders->setEnabled(TRUE);
 		}
 		else
 		{
@@ -1725,7 +1721,20 @@ void LLPanelObjectInventory::createFolderViews(LLInventoryObject* inventory_root
 	bridge = LLTaskInvFVBridge::createObjectBridge(this, inventory_root);
 	if(bridge)
 	{
-		createViewsForCategory(&contents, inventory_root, mFolders);
+		LLFolderViewFolder::Params p;
+		p.name = inventory_root->getName();
+		p.tool_tip = p.name;
+		p.root = mFolders;
+		p.listener = bridge;
+
+		LLFolderViewFolder* new_folder = LLUICtrlFactory::create<LLFolderViewFolder>(p);
+		new_folder->addToFolder(mFolders);
+		new_folder->toggleOpen();
+
+		if (!contents.empty())
+		{
+			createViewsForCategory(&contents, inventory_root, new_folder);
+		}
 	}
 }
 
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 7790a382d9..fff892af68 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2447,9 +2447,6 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale
 	<string name="GroupMoneyDebits">Debits</string>
 	<string name="GroupMoneyDate">[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]</string>
 
-	<!-- viewer object -->
-	<string name="ViewerObjectContents">Contents</string>
-
 	<!-- Viewer menu -->
 	<string name="AcquiredItems">Acquired Items</string>
 	<string name="Cancel">Cancel</string>
-- 
cgit v1.2.3