1 files changed, 49 insertions, 14 deletions

diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index e18ecd2e2a..6926fa9268 100755
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -191,6 +191,7 @@ LLFolderView * LLInventoryPanel::createFolderRoot(LLUUID root_id )
     p.show_empty_message = mShowEmptyMessage;
     p.show_item_link_overlays = mShowItemLinkOverlays;
     p.root = NULL;
+    p.allow_drop = mParams.allow_drop_on_root;
     p.options_menu = "menu_inventory.xml";
 
     return LLUICtrlFactory::create<LLFolderView>(p);
@@ -290,7 +291,12 @@ void LLInventoryPanel::initFromParams(const LLInventoryPanel::Params& params)
 		getFilter().setFilterCategoryTypes(getFilter().getFilterCategoryTypes() & ~(1ULL << LLFolderType::FT_INBOX));
 		getFilter().setFilterCategoryTypes(getFilter().getFilterCategoryTypes() & ~(1ULL << LLFolderType::FT_OUTBOX));
 	}
-
+    // hide marketplace listing box, unless we want to show it (note: hacky as show_root_folder is only used for marketplace...)
+	if (!gSavedSettings.getBOOL("InventoryOutboxMakeVisible") && !mParams.show_root_folder)
+	{
+		getFilter().setFilterCategoryTypes(getFilter().getFilterCategoryTypes() & ~(1ULL << LLFolderType::FT_MARKETPLACE_LISTINGS));
+    }
+    
 	// set the filter for the empty folder if the debug setting is on
 	if (gSavedSettings.getBOOL("DebugHideEmptySystemFolders"))
 	{
@@ -583,7 +589,8 @@ void LLInventoryPanel::modelChanged(U32 mask)
 			else if (!model_item && view_item && viewmodel_item)
 			{
 				// Remove the item's UI.
-                removeItemID(viewmodel_item->getUUID());
+				const LLUUID& idp = viewmodel_item->getUUID();
+                removeItemID(idp);
 				view_item->destroyView();
 			}
 		}
@@ -608,13 +615,13 @@ void LLInventoryPanel::modelChanged(U32 mask)
 
 LLUUID LLInventoryPanel::getRootFolderID()
 {
+    LLUUID root_id;
 	if (mFolderRoot.get() && mFolderRoot.get()->getViewModelItem())
 	{
-		return static_cast<LLFolderViewModelItemInventory*>(mFolderRoot.get()->getViewModelItem())->getUUID();
+		root_id = static_cast<LLFolderViewModelItemInventory*>(mFolderRoot.get()->getViewModelItem())->getUUID();
 	}
 	else
 	{
-		LLUUID root_id;
 		if (mParams.start_folder.id.isChosen())
 		{
 			root_id = mParams.start_folder.id;
@@ -642,8 +649,8 @@ LLUUID LLInventoryPanel::getRootFolderID()
 				}
 			}
 		}
-		return root_id;
 	}
+    return root_id;
 }
 
 // static
@@ -765,7 +772,7 @@ void LLInventoryPanel::initializeViews()
 }
 
 
-LLFolderViewFolder * LLInventoryPanel::createFolderViewFolder(LLInvFVBridge * bridge)
+LLFolderViewFolder * LLInventoryPanel::createFolderViewFolder(LLInvFVBridge * bridge, bool allow_drop)
 {
 	LLFolderViewFolder::Params params(mParams.folder);
 
@@ -773,6 +780,7 @@ LLFolderViewFolder * LLInventoryPanel::createFolderViewFolder(LLInvFVBridge * br
 	params.root = mFolderRoot.get();
 	params.listener = bridge;
 	params.tool_tip = params.name;
+    params.allow_drop = allow_drop;
 
 	params.font_color = (bridge->isLibraryItem() ? sLibraryColor : (bridge->isLink() ? sLinkColor : sDefaultColor));
 	params.font_highlight_color = (bridge->isLibraryItem() ? sLibraryColor : (bridge->isLink() ? sLinkColor : sDefaultHighlightColor));
@@ -801,21 +809,40 @@ LLFolderViewItem* LLInventoryPanel::buildNewViews(const LLUUID& id)
 {
  	LLInventoryObject const* objectp = gInventory.getObject(id);
 	
-	if (!objectp) return NULL;
+	if (!objectp)
+    {
+        return NULL;
+    }
 
 	LLFolderViewItem* folder_view_item = getItemByID(id);
 
- 		const LLUUID &parent_id = objectp->getParentUUID();
+    const LLUUID &parent_id = objectp->getParentUUID();
 	LLFolderViewFolder* parent_folder = (LLFolderViewFolder*)getItemByID(parent_id);
   		
+    // Force the creation of an extra root level folder item if required by the inventory panel (default is "false")
+    bool allow_drop = true;
+    bool create_root = false;
+    if (mParams.show_root_folder)
+    {
+        LLUUID root_id = getRootFolderID();
+        if (root_id == id)
+        {
+            // We insert an extra level that's seen by the UI but has no influence on the model
+            parent_folder = dynamic_cast<LLFolderViewFolder*>(folder_view_item);
+            folder_view_item = NULL;
+            allow_drop = mParams.allow_drop_on_root;
+            create_root = true;
+        }
+    }
+
  	if (!folder_view_item && parent_folder)
   		{
   			if (objectp->getType() <= LLAssetType::AT_NONE ||
   				objectp->getType() >= LLAssetType::AT_COUNT)
   			{
   				LL_WARNS() << "LLInventoryPanel::buildNewViews called with invalid objectp->mType : "
-  						<< ((S32) objectp->getType()) << " name " << objectp->getName() << " UUID " << objectp->getUUID()
-  						<< LL_ENDL;
+                << ((S32) objectp->getType()) << " name " << objectp->getName() << " UUID " << objectp->getUUID()
+                << LL_ENDL;
   				return NULL;
   			}
   		
@@ -831,7 +858,7 @@ LLFolderViewItem* LLInventoryPanel::buildNewViews(const LLUUID& id)
   																				objectp->getUUID());
   				if (new_listener)
   				{
-				folder_view_item = createFolderViewFolder(new_listener);
+				folder_view_item = createFolderViewFolder(new_listener,allow_drop);
   				}
   			}
   			else
@@ -854,11 +881,16 @@ LLFolderViewItem* LLInventoryPanel::buildNewViews(const LLUUID& id)
   			}
  
   	    if (folder_view_item)
-  			{
+        {
             llassert(parent_folder != NULL);
             folder_view_item->addToFolder(parent_folder);
 			addItemID(id, folder_view_item);
-		}
+            // In the case of the root folder been shown, open that folder by default once the widget is created
+            if (create_root)
+            {
+                folder_view_item->setOpen(TRUE);
+            }
+        }
 	}
 
 	// If this is a folder, add the children of the folder and recursively add any 
@@ -967,7 +999,7 @@ BOOL LLInventoryPanel::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 		// If folder view is empty the (x, y) point won't be in its rect
 		// so the handler must be called explicitly.
 		// but only if was not handled before. See EXT-6746.
-		if (!handled && !mFolderRoot.get()->hasVisibleChildren())
+		if (!handled && mParams.allow_drop_on_root && !mFolderRoot.get()->hasVisibleChildren())
 		{
 			handled = mFolderRoot.get()->handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg);
 		}
@@ -1532,5 +1564,8 @@ namespace LLInitParam
 		declare(LLFolderType::lookup(LLFolderType::FT_INBOX)            , LLFolderType::FT_INBOX);
 		declare(LLFolderType::lookup(LLFolderType::FT_OUTBOX)           , LLFolderType::FT_OUTBOX);
 		declare(LLFolderType::lookup(LLFolderType::FT_BASIC_ROOT)       , LLFolderType::FT_BASIC_ROOT);
+		declare(LLFolderType::lookup(LLFolderType::FT_MARKETPLACE_LISTINGS)   , LLFolderType::FT_MARKETPLACE_LISTINGS);
+		declare(LLFolderType::lookup(LLFolderType::FT_MARKETPLACE_STOCK), LLFolderType::FT_MARKETPLACE_STOCK);
+		declare(LLFolderType::lookup(LLFolderType::FT_MARKETPLACE_VERSION), LLFolderType::FT_MARKETPLACE_VERSION);
 	}
 }