From 83670fc520cf8f4f78446f853cae584c2970f4fc Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 21 Jan 2010 09:53:18 -0500
Subject: [PATCH] For EXT-4222: Switching outfits sometimes causes me to wear
both, and show previous outfit as worn.
---
indra/newview/llappearancemgr.cpp | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index ccda737fc62..6972d4ec983 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));
+ }
}
--
GitLab