From 9571dcfed6e12f23b170ddbc6d0fba93a96e657c Mon Sep 17 00:00:00 2001
From: "Nyx (Neal Orman)" <nyx@lindenlab.com>
Date: Wed, 16 Dec 2009 14:23:58 -0500
Subject: EXT-3514 update debug settings for appearance

fixing layout issues with previous patch to avoid breaking the bottom buttons

reviewed by vir

--HG--
branch : avatar-pipeline
---
 indra/newview/llpaneloutfitsinventory.cpp             |  7 +++++--
 .../skins/default/xui/en/panel_outfits_inventory.xml  | 19 +++++++++----------
 2 files changed, 14 insertions(+), 12 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llpaneloutfitsinventory.cpp b/indra/newview/llpaneloutfitsinventory.cpp
index a6388164d5..6ab9870b06 100644
--- a/indra/newview/llpaneloutfitsinventory.cpp
+++ b/indra/newview/llpaneloutfitsinventory.cpp
@@ -90,7 +90,10 @@ void LLPanelOutfitsInventory::updateVerbs()
 		mParent->updateVerbs();
 	}
 
-	childSetVisible("look_edit_btn",sShowDebugEditor);
+	if (mListCommands)
+	{
+		mListCommands->childSetVisible("look_edit_btn",sShowDebugEditor);
+	}
 }
 
 void LLPanelOutfitsInventory::setParent(LLSidepanelAppearance* parent)
@@ -239,7 +242,7 @@ void LLPanelOutfitsInventory::initListCommandsHandlers()
 	mListCommands->childSetAction("add_btn", boost::bind(&LLPanelOutfitsInventory::onAddButtonClick, this));
 	mListCommands->childSetAction("wear_btn", boost::bind(&LLPanelOutfitsInventory::onWearButtonClick, this));
 
-	childSetAction("look_edit_btn", boost::bind(&LLPanelOutfitsInventory::onSelectorButtonClicked, this));
+	mListCommands->childSetAction("look_edit_btn", boost::bind(&LLPanelOutfitsInventory::onSelectorButtonClicked, this));
 
 	LLDragAndDropButton* trash_btn = mListCommands->getChild<LLDragAndDropButton>("trash_btn");
 	trash_btn->setDragAndDropHandler(boost::bind(&LLPanelOutfitsInventory::handleDragAndDropToTrash, this
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
index 42537553ec..2f176f011b 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -47,16 +47,6 @@
         name="cof_accordionpanel"
         start_folder="Current Outfit" />
    </tab_container>
-   <button
-     follows="bottom|left" 
-     height="18" 
-     label="edit look"
-     layout="topleft"
-     left="10"
-     name="look_edit_btn"
-     top_pad="10"
-     visible="false"
-     width="90" />
 	<panel
 	  background_visible="true"
 	  follows="bottom|left"
@@ -110,5 +100,14 @@
 		right="-5"
 		top_pad="0"
 		width="90" />
+      <button
+       follows="bottom|left" 
+       height="23" 
+       label="edit look"
+       layout="topleft"
+       left_pad="-200"
+       name="look_edit_btn"
+       visible="false"
+       width="90" />
 	 </panel>
 </panel>
-- 
cgit v1.2.3