livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
meow-7.2.2
Loren Shih 2010-01-06 15:08:20 -05:00
parent d9b8f65c03
commit 08a9c1eae0
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llpaneloutfitsinventory.cpp
View File

@ -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;

2
indra/newview/llsidepanelappearance.cpp
View File

@ -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();

4
indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
View File

@ -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