diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-01-11 10:57:26 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-01-11 10:57:26 -0500 |
| commit | d258883b0c635ae10d9698217024dc5b7b168d96 (patch) | |
| tree | 46c7c6922957973c16fec35203ecf16f483f45cc | |
| parent | 6a1a93be1addb3cdb86fd163046a051344312cf2 (diff) | |
EXT-3952 save outfit button should be enabled on the wearing tab
Enabled the button on the wearing tab of the appearance sidepanel and
set its functionality to switch to the my outfits tab before the auto-rename
happens.
Reviewed by Seraph
| -rw-r--r-- | indra/newview/llpaneloutfitsinventory.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/llpaneloutfitsinventory.cpp b/indra/newview/llpaneloutfitsinventory.cpp index a1c12412b5..550fee71bf 100644 --- a/indra/newview/llpaneloutfitsinventory.cpp +++ b/indra/newview/llpaneloutfitsinventory.cpp @@ -181,6 +181,10 @@ void LLPanelOutfitsInventory::onNew() { const std::string& outfit_name = LLViewerFolderType::lookupNewCategoryName(LLFolderType::FT_OUTFIT); LLUUID outfit_folder = gAgentWearables.makeNewOutfitLinks(outfit_name); + if (mAppearanceTabs) + { + mAppearanceTabs->selectTabByName("outfitslist_tab"); + } } void LLPanelOutfitsInventory::onSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action) @@ -412,8 +416,7 @@ BOOL LLPanelOutfitsInventory::isActionEnabled(const LLSD& userdata) return (getCorrectListenerForAction() != NULL) && hasItemsSelected(); } - if (command_name == "wear" || - command_name == "make_outfit") + if (command_name == "wear") { const BOOL is_my_outfits = (mActivePanel->getName() == "outfitslist_tab"); if (!is_my_outfits) @@ -421,6 +424,10 @@ BOOL LLPanelOutfitsInventory::isActionEnabled(const LLSD& userdata) return FALSE; } } + if (command_name == "make_outfit") + { + return TRUE; + } if (command_name == "edit" || command_name == "add" |