diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-01-21 09:53:18 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-01-21 09:53:18 -0500 |
| commit | 83670fc520cf8f4f78446f853cae584c2970f4fc (patch) | |
| tree | 4334b9596f3228906fa09be084041689b6c514d3 /indra/newview | |
| parent | a9871e8d258404ff32956b093c80b4cf56c3522c (diff) | |
For EXT-4222: Switching outfits sometimes causes me to wear both, and show previous outfit as worn.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llappearancemgr.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index ccda737fc6..6972d4ec98 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -327,14 +327,14 @@ bool LLWearableHoldingPattern::isDone() bool LLWearableHoldingPattern::isTimedOut() { - static F32 max_wait_time = 5.0; // give up if wearable fetches haven't completed in max_wait_time seconds. + static F32 max_wait_time = 15.0; // give up if wearable fetches haven't completed in max_wait_time seconds. return mWaitTime.getElapsedTimeF32() > max_wait_time; } bool LLWearableHoldingPattern::pollCompletion() { bool done = isDone(); - llinfos << "polling, done status: " << done << llendl; + llinfos << "polling, done status: " << done << " elapsed " << mWaitTime.getElapsedTimeF32() << llendl; if (done) { // Activate all gestures in this folder @@ -829,7 +829,10 @@ void LLAppearanceManager::updateAppearanceFromCOF() } - doOnIdleRepeating(boost::bind(&LLWearableHoldingPattern::pollCompletion,holder)); + if (!holder->pollCompletion()) + { + doOnIdleRepeating(boost::bind(&LLWearableHoldingPattern::pollCompletion,holder)); + } } |