From b0b68903734cbfbfcf9bfcb7d47cf766a9897d0e Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Fri, 15 Jan 2010 14:57:00 -0500 Subject: EXT-4253 "unsaved" detection seems buggy Corrected bug where saving an outfit wouldn't update the "unsaved" marker on the UI. Also switched the UI to use a popup dialog to request the name of the outfit being made, as we could not convey everything we needed to on the button alone. Code reviewed by Vir --- indra/newview/llappearancemgr.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'indra/newview/llappearancemgr.cpp') diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 4d4a89bcd4..748d8bdfbf 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -392,6 +392,21 @@ const LLViewerInventoryItem* LLAppearanceManager::getBaseOutfitLink() return NULL; } +bool LLAppearanceManager::getBaseOutfitName(std::string& name) +{ + const LLViewerInventoryItem* outfit_link = getBaseOutfitLink(); + if(outfit_link) + { + const LLViewerInventoryCategory *cat = outfit_link->getLinkedCategory(); + if (cat) + { + name = cat->getName(); + return true; + } + } + return false; +} + // Update appearance from outfit folder. void LLAppearanceManager::changeOutfit(bool proceed, const LLUUID& category, bool append) { @@ -630,6 +645,7 @@ void LLAppearanceManager::createBaseOutfitLink(const LLUUID& category, LLPointer LLAssetType::AT_LINK_FOLDER, link_waiter); new_outfit_name = catp->getName(); } + updatePanelOutfitName(new_outfit_name); } -- cgit v1.3