summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2010-01-21 15:57:06 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2010-01-21 15:57:06 -0500
commitccc90257e7622bcf35454e8d4a0780f020ee6c39 (patch)
tree701023a1516ff1503db900b36f438defa573ba47 /indra
parent4277d6b576836bd722d5100b709ebf923640109e (diff)
For EXT-4222: Switching outfits sometimes causes me to wear both, and show previous outfit as worn.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llappearancemgr.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 6972d4ec98..61d60fdff9 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -322,7 +322,15 @@ LLWearableHoldingPattern::~LLWearableHoldingPattern()
bool LLWearableHoldingPattern::isDone()
{
- return (mResolved >= (S32)mFoundList.size());
+ if (mResolved >= (S32)mFoundList.size())
+ return true; // have everything we were waiting for
+ else if (isTimedOut())
+ {
+ llwarns << "Exceeded max wait time, updating appearance based on what has arrived" << llendl;
+ return true;
+ }
+ return false;
+
}
bool LLWearableHoldingPattern::isTimedOut()
@@ -369,16 +377,8 @@ bool LLWearableHoldingPattern::pollCompletion()
}
delete this;
- return done;
}
- else if (isTimedOut())
- {
- llwarns << "wearables taking too long to fetch for outfit, retrying updateAppearanceFromCOF()." << llendl;
- delete this;
- LLAppearanceManager::instance().updateAppearanceFromCOF();
- return true;
- }
- return false;
+ return done;
}
static void removeDuplicateItems(LLInventoryModel::item_array_t& items)