From ec9b92d274b6fb0d8d14ed88010835a5feab2a07 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Tue, 6 Sep 2016 14:07:20 +0300 Subject: MAINT-6698 [VOB] "Save" button is always enabled for outfit with non-default image even if there were no changes --- indra/newview/llappearancemgr.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 1f8adbcb95..ff5439d610 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -2966,6 +2966,16 @@ void LLAppearanceMgr::updateIsDirty() gInventory.collectDescendentsIf(base_outfit, outfit_cats, outfit_items, LLInventoryModel::EXCLUDE_TRASH, collector); + for (U32 i = 0; i < outfit_items.size(); ++i) + { + LLViewerInventoryItem* linked_item = outfit_items.at(i)->getLinkedItem(); + if (linked_item != NULL && linked_item->getActualType() == LLAssetType::AT_TEXTURE) + { + outfit_items.erase(outfit_items.begin() + i); + break; + } + } + if(outfit_items.size() != cof_items.size()) { LL_DEBUGS("Avatar") << "item count different - base " << outfit_items.size() << " cof " << cof_items.size() << LL_ENDL; -- cgit v1.2.3