summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2009-11-24 15:34:46 -0500
committerNyx (Neal Orman) <nyx@lindenlab.com>2009-11-24 15:34:46 -0500
commit562cc63a2960ba29d04c9c2164914b74166222ad (patch)
tree9013193636483a14760e85ed0d8477548064c01b
parentc812c616ea0ba6531b3fe7f75efc815081cd0c2e (diff)
parent4821134aa7be2471aad461aa6a730a68a4c92560 (diff)
Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/
--HG-- branch : avatar-pipeline
-rw-r--r--indra/newview/llagentwearables.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index 574b449d23..475f34dc2b 100644
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -1547,7 +1547,6 @@ void LLAgentWearables::setWearableOutfit(const LLInventoryItem::item_array_t& it
gInventory.notifyObservers();
- queryWearableCache();
std::vector<LLWearable*>::iterator wearable_iter;
@@ -1570,6 +1569,7 @@ void LLAgentWearables::setWearableOutfit(const LLInventoryItem::item_array_t& it
// Start rendering & update the server
mWearablesLoaded = TRUE;
checkWearablesLoaded();
+ queryWearableCache();
updateServer();
lldebugs << "setWearableOutfit() end" << llendl;