summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2016-09-06 14:07:20 +0300
committerMnikolenko Productengine <mnikolenko@productengine.com>2016-09-06 14:07:20 +0300
commitec9b92d274b6fb0d8d14ed88010835a5feab2a07 (patch)
tree6fa9c16bf7d584745264c21d73b68453acf5b77a /indra/newview
parentfc17f62335d728e79bf9f18f76482fa3bf45b34e (diff)
MAINT-6698 [VOB] "Save" button is always enabled for outfit with non-default image even if there were no changes
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llappearancemgr.cpp10
1 files changed, 10 insertions, 0 deletions
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;