From 08a9c1eae0070e6dc9c054e862bbcc1a1c0490cf Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Wed, 6 Jan 2010 15:08:20 -0500
Subject: EXT-3961 : Switch order of "Wearing" and "My Outfits" tabs
Trivial name change to turn "accordionpanel" into "tab" for outfits tabs since those are no longer accordions.
---
indra/newview/llpaneloutfitsinventory.cpp | 6 +++---
indra/newview/llsidepanelappearance.cpp | 2 +-
indra/newview/skins/default/xui/en/panel_outfits_inventory.xml | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/indra/newview/llpaneloutfitsinventory.cpp b/indra/newview/llpaneloutfitsinventory.cpp
index 41745e4994..e84f2c2dce 100644
--- a/indra/newview/llpaneloutfitsinventory.cpp
+++ b/indra/newview/llpaneloutfitsinventory.cpp
@@ -405,7 +405,7 @@ BOOL LLPanelOutfitsInventory::isActionEnabled(const LLSD& userdata)
if (command_name == "wear" ||
command_name == "make_outfit")
{
- const BOOL is_my_outfits = (mActivePanel->getName() == "outfitslist_accordionpanel");
+ const BOOL is_my_outfits = (mActivePanel->getName() == "outfitslist_tab");
if (!is_my_outfits)
{
return FALSE;
@@ -447,11 +447,11 @@ void LLPanelOutfitsInventory::initTabPanels()
{
mTabPanels.resize(2);
- LLInventoryPanel *cof_panel = getChild<LLInventoryPanel>("cof_accordionpanel");
+ LLInventoryPanel *cof_panel = getChild<LLInventoryPanel>("cof_tab");
cof_panel->setShowFolderState(LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS);
mTabPanels[0] = cof_panel;
- LLInventoryPanel *myoutfits_panel = getChild<LLInventoryPanel>("outfitslist_accordionpanel");
+ LLInventoryPanel *myoutfits_panel = getChild<LLInventoryPanel>("outfitslist_tab");
myoutfits_panel->setFilterTypes(1LL << LLFolderType::FT_OUTFIT, LLInventoryFilter::FILTERTYPE_CATEGORY);
myoutfits_panel->setShowFolderState(LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS);
mTabPanels[1] = myoutfits_panel;
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp
index 0aefebce10..d870009e4f 100644
--- a/indra/newview/llsidepanelappearance.cpp
+++ b/indra/newview/llsidepanelappearance.cpp
@@ -213,7 +213,7 @@ void LLSidepanelAppearance::onOpenOutfitButtonClicked()
if (tab_outfits)
{
tab_outfits->changeOpenClose(FALSE);
- LLInventoryPanel *inventory_panel = tab_outfits->findChild<LLInventoryPanel>("outfitslist_accordionpanel");
+ LLInventoryPanel *inventory_panel = tab_outfits->findChild<LLInventoryPanel>("outfitslist_tab");
if (inventory_panel)
{
LLFolderView *folder = inventory_panel->getRootFolder();
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 7e512f9594..a65bddd1db 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -31,7 +31,7 @@
left="0"
top="0"
mouse_opaque="true"
- name="cof_accordionpanel"
+ name="cof_tab"
start_folder="Current Outfit" />
<inventory_panel
label="MY OUTFITS"
@@ -44,7 +44,7 @@
height="500"
width="290"
mouse_opaque="true"
- name="outfitslist_accordionpanel"
+ name="outfitslist_tab"
start_folder="My Outfits" />
</tab_container>
<panel
--
cgit v1.2.3