From cdb158e9e0cff7070bb68c721cec0e90b0030fb2 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Wed, 6 Jan 2010 12:33:28 -0500 Subject: EXT-3954 : "Wear" button shouldn't be enabled in "Wearing" tab EXT-3952 : "Make Outfit" button shouldn't be enabled in "Wearing" tab EXT-3955 : "Add to Current Outfit" gear menu option confusing, remove it EXT-3961 : Switch order of "Wearing" and "My Outfits" tabs Most of these are very minor xui/button-state changes. Also added a new onOpen method to llpaneloutfitsinventory so that it can update its state (notably, which tab is active) when the sidepanel is opened. --- indra/newview/llsidepanelappearance.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra/newview/llsidepanelappearance.cpp') diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp index e2ce534c4f..0aefebce10 100644 --- a/indra/newview/llsidepanelappearance.cpp +++ b/indra/newview/llsidepanelappearance.cpp @@ -166,6 +166,11 @@ void LLSidepanelAppearance::onOpen(const LLSD& key) refreshCurrentOutfitName(); updateVerbs(); + if (mPanelOutfitsInventory) + { + mPanelOutfitsInventory->onOpen(key); + } + if(key.size() == 0) return; -- cgit v1.2.3 From 08a9c1eae0070e6dc9c054e862bbcc1a1c0490cf Mon Sep 17 00:00:00 2001 From: Loren Shih 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/llsidepanelappearance.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llsidepanelappearance.cpp') 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("outfitslist_accordionpanel"); + LLInventoryPanel *inventory_panel = tab_outfits->findChild("outfitslist_tab"); if (inventory_panel) { LLFolderView *folder = inventory_panel->getRootFolder(); -- cgit v1.2.3 From cdb6f67f7199bbd82fe85ccfd5c9812226eb12ba Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Fri, 8 Jan 2010 13:10:15 -0500 Subject: EXT-3958 title needs to update appropriately when changes made to outfit We now show a string "(unsaved)" under the appearance panel outfit title when the currently loaded outfit has been modified from its original state. Tested with following conditions: 1) item added to loaded outfit 2) item removed from loaded outfit 3) item replaced in loaded outfit Appears to work properly on login as well. Checking is a manual folder compare, but should be fairly efficient. XUI changes submitted by Erica Entire diff reviewed by Vir --- indra/newview/llsidepanelappearance.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/newview/llsidepanelappearance.cpp') diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp index 0aefebce10..0a1f7ad0da 100644 --- a/indra/newview/llsidepanelappearance.cpp +++ b/indra/newview/llsidepanelappearance.cpp @@ -151,6 +151,8 @@ BOOL LLSidepanelAppearance::postBuild() } mCurrentLookName = getChild("currentlook_name"); + + mOutfitDirtyTag = getChild("currentlook_title"); mCurrOutfitPanel = getChild("panel_currentlook"); @@ -316,6 +318,7 @@ void LLSidepanelAppearance::updateVerbs() void LLSidepanelAppearance::refreshCurrentOutfitName(const std::string& name) { + mOutfitDirtyTag->setVisible(LLAppearanceManager::getInstance()->isOutfitDirty()); if (name == "") { const LLViewerInventoryItem *outfit_link = LLAppearanceManager::getInstance()->getBaseOutfitLink(); -- cgit v1.2.3