From 2117b096d7733d3d6a41923e227e3bf3c3ec0d28 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Wed, 11 Nov 2009 18:13:43 -0500
Subject: EXT-2377 : Add XML switch to showing either menubar or gear menu

Reverting previous checkin for enabling this.  This is more complicated than worth spending time on, at the moment.
---
 indra/newview/llpanelmaininventory.cpp | 29 +++--------------------------
 1 file changed, 3 insertions(+), 26 deletions(-)

(limited to 'indra/newview/llpanelmaininventory.cpp')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 9b33fc1839..e3b2ab77aa 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -49,7 +49,7 @@
 #include "llviewermenu.h"
 #include "llviewertexturelist.h"
 
-static LLDefaultChildRegistry::Register<LLPanelMainInventory> r("panel_main_inventory");
+static LLRegisterPanelClassWrapper<LLPanelMainInventory> t_inventory("panel_main_inventory"); // Seraph is this redundant with constructor?
 
 void on_file_loaded_for_save(BOOL success, 
 							 LLViewerFetchedTexture *src_vi,
@@ -90,8 +90,8 @@ private:
 /// LLPanelMainInventory
 ///----------------------------------------------------------------------------
 
-LLPanelMainInventory::LLPanelMainInventory(const LLPanelMainInventory::Params& p)
-	: LLPanel(p),
+LLPanelMainInventory::LLPanelMainInventory()
+	: LLPanel(),
 	  mActivePanel(NULL),
 	  mSavedFolderState(NULL),
 	  mFilterText(""),
@@ -124,24 +124,6 @@ LLPanelMainInventory::LLPanelMainInventory(const LLPanelMainInventory::Params& p
 	
 	mSavedFolderState = new LLSaveFolderState();
 	mSavedFolderState->setApply(FALSE);
-
-	if (p.hide_top_menu)
-	{
-		LLInventoryPanel *top_panel = getChild<LLInventoryPanel>("top_panel");
-		if (top_panel)
-		{
-			top_panel->setVisible(FALSE);
-		}
-	}
-
-	if (p.hide_bottom_menu)
-	{
-		LLInventoryPanel *bottom_panel = getChild<LLInventoryPanel>("bottom_panel");
-		if (bottom_panel)
-		{
-			bottom_panel->setVisible(FALSE);
-		}
-	}
 }
 
 BOOL LLPanelMainInventory::postBuild()
@@ -222,11 +204,6 @@ void LLPanelMainInventory::initListCommandsHandlers()
 	mListCommands->childSetAction("options_gear_btn", boost::bind(&LLPanelMainInventory::onGearButtonClick, this));
 	mListCommands->childSetAction("trash_btn", boost::bind(&LLPanelMainInventory::onTrashButtonClick, this));
 	mListCommands->childSetAction("add_btn", boost::bind(&LLPanelMainInventory::onAddButtonClick, this));
-	/*
-	mListCommands->getChild<LLButton>("add_btn")->setHeldDownCallback(boost::bind(&LLPanelMainInventory::onAddButtonHeldDown, this));
-	static const LLSD add_landmark_command("add_landmark");
-	mListCommands->childSetAction("add_btn", boost::bind(&LLPanelMainInventory::onAddAction, this, add_landmark_command));
-	*/
 
 	LLDragAndDropButton* trash_btn = mListCommands->getChild<LLDragAndDropButton>("trash_btn");
 	trash_btn->setDragAndDropHandler(boost::bind(&LLPanelMainInventory::handleDragAndDropToTrash, this
-- 
cgit v1.2.3