livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

For EXT-4222: Switching outfits sometimes causes me to wear both, and show previous outfit as worn.

meow-7.2.2
Brad Payne (Vir Linden) 2010-01-21 09:53:18 -05:00
parent a9871e8d25
commit 83670fc520
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llappearancemgr.cpp
View File

@ -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));
}
}