summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2010-02-18 16:10:35 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2010-02-18 16:10:35 -0500
commit284eb11a102af4889f3e1a1ef97699f67e4c0fa3 (patch)
tree76fe00ec397b7ed6743cf47a460dc341c8de6694
parent000106dd3faaae47af0e0b2d74145a260d540fa8 (diff)
Work in progress on EXT-5333: Bodyparts missing from appearance and COF
-rw-r--r--indra/newview/llagentwearables.cpp6
-rw-r--r--indra/newview/llappearancemgr.cpp3
2 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index a955696447..94fd5132ca 100644
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -1040,9 +1040,9 @@ void LLAgentWearables::onInitialWearableAssetArrived(LLWearable* wearable, void*
return;
}
// BAP RESTORE TMP
- if (wearable && type != WT_SHAPE) // force failure for shape to test recovery path.
+// if (wearable && type != WT_SHAPE) // force failure for shape to test recovery path.
-// if (wearable)
+ if (wearable)
{
llassert(type == wearable->getType());
wearable->setItemID(wear_data->mItemID);
@@ -1580,7 +1580,7 @@ void LLAgentWearables::setWearableOutfit(const LLInventoryItem::item_array_t& it
const LLDynamicArray< LLWearable* >& wearables,
BOOL remove)
{
- lldebugs << "setWearableOutfit() start" << llendl;
+ llinfos << "setWearableOutfit() start" << llendl;
BOOL wearables_to_remove[WT_COUNT];
wearables_to_remove[WT_SHAPE] = FALSE;
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 9da341b669..74c45a9467 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -712,7 +712,8 @@ void LLAppearanceManager::linkAll(const LLUUID& category,
void LLAppearanceManager::updateCOF(const LLUUID& category, bool append)
{
- llinfos << "starting" << llendl;
+ LLViewerInventoryCategory *pcat = gInventory.getCategory(category);
+ llinfos << "starting, cat " << (pcat ? pcat->getName() : "[UNKNOWN]") << llendl;
const LLUUID cof = getCOF();