summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-12-12 12:06:24 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-12-12 12:06:24 -0500
commit46cfca5ed6590435d5f1956376479a8876770376 (patch)
tree46c24dac8cebfef48d21044b67134cb6c08ab91c
parenta5205d4d6a5f3478927cbede80671051c3e16f35 (diff)
Fix for problem found with changing to an outfit with missing shape
-rwxr-xr-xindra/newview/llappearancemgr.cpp16
1 files changed, 10 insertions, 6 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index e326ca5e15..b0136a570e 100755
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -191,7 +191,7 @@ public:
{
LLViewerInventoryItem* item = *it;
llassert(item);
- addItem(item->getUUID());
+ addItem(item->getLinkedUUID());
}
}
@@ -1732,11 +1732,6 @@ void LLAppearanceMgr::updateCOF(const LLUUID& category, bool append)
getDescendentsOfAssetType(category, gest_items, LLAssetType::AT_GESTURE, false);
removeDuplicateItems(gest_items);
- // Remove current COF contents.
- bool keep_outfit_links = append;
- purgeCategory(cof, keep_outfit_links);
- gInventory.notifyObservers();
-
#ifndef LL_RELEASE_FOR_DOWNLOAD
LL_DEBUGS("Avatar") << self_av_string() << "Linking body items" << LL_ENDL;
#endif
@@ -1770,6 +1765,15 @@ void LLAppearanceMgr::updateCOF(const LLUUID& category, bool append)
{
link_waiter->addItem(category);
}
+
+ // Remove current COF contents. Have to do this after creating
+ // the link_waiter so links can be followed for any items that get
+ // carried over (e.g. keeping old shape if the new outfit does not
+ // contain one)
+ bool keep_outfit_links = append;
+ purgeCategory(cof, keep_outfit_links);
+ gInventory.notifyObservers();
+
LL_DEBUGS("Avatar") << self_av_string() << "waiting for LLUpdateAppearanceOnDestroy" << LL_ENDL;
}