- fixed : wearable list shouldn't be visible in the "Outfit Edit" sidebar...

- fixed : wearable list shouldn't be visible in the "Outfit Edit" sidebar panel when @showinv=n restricted

--HG--
branch : RLVa

indra/newview/llpaneloutfitedit.cpp

@@ -71,6 +71,9 @@
 #include "llwearableitemslist.h"
 #include "llwearabletype.h"
 #include "llweb.h"
+// [RLVa:KB] - Checked: 2010-09-16 (RLVa-1.2.1a)
+#include "rlvhandler.h"
+// [/RLVa:KB]
 
 static LLRegisterPanelClassWrapper<LLPanelOutfitEdit> t_outfit_edit("panel_outfit_edit");
 
@@ -592,6 +595,10 @@ void LLPanelOutfitEdit::toggleAddWearablesPanel()
 
 void LLPanelOutfitEdit::showAddWearablesPanel(bool show_add_wearables)
 {
+// [RLVa:KB] - Checked: 2010-09-16 (RLVa-1.2.1a) | Added: RLVa-1.2.1a
+	show_add_wearables = (show_add_wearables) && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWINV));
+// [/RLVa:KB]
+
 	mAddWearablesPanel->setVisible(show_add_wearables);
 	
 	getChild<LLUICtrl>("show_add_wearables_btn")->setValue(show_add_wearables);

indra/newview/llsidepanelappearance.cpp

@@ -521,3 +521,15 @@ void LLSidepanelAppearance::updateScrollingPanelList()
 		mEditWearable->updateScrollingPanelList();
 	}
 }
+
+// [RLVa:KB] - Checked: 2010-09-16 (RLVa-1.2.1a) | Added: RLVa-1.2.1a
+bool LLSidepanelAppearance::isOutfitEditPanelVisible() const
+{
+	return (mOutfitEdit) && (mOutfitEdit->getVisible());
+}
+
+bool LLSidepanelAppearance::isWearableEditPanelVisible() const
+{
+	return (mEditWearable) && (mEditWearable->getVisible());
+}
+// [/RLVa:KB]

indra/newview/llsidepanelappearance.h

@@ -64,6 +64,14 @@ public:
 	void showDefaultSubpart();
 	void updateScrollingPanelList();
 
+// [RLVa:KB] - Checked: 2010-09-16 (RLVa-1.2.1a) | Added: RLVa-1.2.1a
+	bool isOutfitEditPanelVisible() const;
+	bool isWearableEditPanelVisible() const;
+
+	LLPanelOutfitEdit*	 getOutfitEditPanel() { return mOutfitEdit; }
+	LLPanelEditWearable* getWearableEditPanel() { return mEditWearable; }
+// [/RLVa:KB]
+
 private:
 	void onFilterEdit(const std::string& search_string);
 	void onVisibilityChange ( const LLSD& new_visibility );

indra/newview/rlvui.cpp

@@ -32,6 +32,7 @@
 #include "llparcel.h"
 #include "llsidetray.h"
 #include "llsidetraypanelcontainer.h"
+#include "llsidepanelappearance.h"
 #include "lltabcontainer.h"
 #include "llteleporthistory.h"
 #include "llteleporthistorystorage.h"
@@ -250,6 +251,14 @@ void RlvUIEnabler::onToggleShowInv()
 			if ( (!fEnable) && (pAppearanceTabs->getCurrentPanelIndex() == idxTab) )
 				pAppearanceTabs->selectTabPanel(pAppearancePanel->getCurrentOutfitPanel());
 		}
+
+		LLSidepanelAppearance* pCOFPanel = pAppearancePanel->getAppearanceSP();
+		RLV_ASSERT(pCOFPanel);
+		if ( (!fEnable) && (pCOFPanel) && (pCOFPanel->isOutfitEditPanelVisible()) )
+		{
+			// TODO-RLVa: we should really just be collapsing the "Add more..." inventory panel (and disable the button)
+			pCOFPanel->showOutfitsInventoryPanel();
+		}
 	}
 
 	//