diff options
author | Alexei Arabadji <aarabadji@productengine.com> | 2010-06-14 16:12:20 +0300 |
---|---|---|
committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-06-14 16:12:20 +0300 |
commit | 0ec92fb1c8a90d619d0102d0807a32abedc916f1 (patch) | |
tree | 7a7cd4632c27d7b0cc09d37f82ebcf63c7894a10 /indra/newview/llappearancemgr.cpp | |
parent | 5626e1b8afb31158803414117e58cecf82aab339 (diff) |
EXT-7783 FIXED Provided updating outfit label in My outfits and Edit outfit panels.
1 Corrected LLAppearanceMgr::getBaseOutfitLink() method to avoid returning link in case base outfit moved to trash.
2 Hooked up LLSidepanelAppearance::refreshCurrentOutfitName() method on BOFReplaced signal.
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/571/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
-rw-r--r-- | indra/newview/llappearancemgr.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index dba8707423..bc17605202 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -644,6 +644,13 @@ const LLViewerInventoryItem* LLAppearanceMgr::getBaseOutfitLink() const LLViewerInventoryCategory *cat = item->getLinkedCategory(); if (cat && cat->getPreferredType() == LLFolderType::FT_OUTFIT) { + const LLUUID parent_id = cat->getParentUUID(); + LLViewerInventoryCategory* parent_cat = gInventory.getCategory(parent_id); + // if base outfit moved to trash it means that we don't have base outfit + if (parent_cat != NULL && parent_cat->getPreferredType() == LLFolderType::FT_TRASH) + { + return NULL; + } return item; } } |