diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-09-10 11:51:55 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-09-10 11:51:55 -0700 |
| commit | 807aec7bafe19fca75a8f3980bd621fad7c8338e (patch) | |
| tree | f2e120963ff103524ef6206506c1ee9e0bdd3a2d /indra/newview/llvoavatar.cpp | |
| parent | 19026c621e338040df59adabdf7055924271f66d (diff) | |
| parent | 1f46b1d87bf4664e62131e7823ab5a7fcafe4b73 (diff) | |
Pull from lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index f985ee0c15..cab6fbdc93 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -6835,12 +6835,14 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys ) llinfos << "AvatarAppearance msg received without any parameters, object: " << getID() << llendl; } + const F32 LOADING_TIMEOUT_SECONDS = 60.f; // this isn't really a problem if we already have a non-default shape - if (visualParamWeightsAreDefault()) + if (visualParamWeightsAreDefault() && mRuthTimer.getElapsedTimeF32() > LOADING_TIMEOUT_SECONDS) { // re-request appearance, hoping that it comes back with a shape next time llinfos << "Re-requesting AvatarAppearance for object: " << getID() << llendl; LLAvatarPropertiesProcessor::getInstance()->sendAvatarTexturesRequest(getID()); + mRuthTimer.reset(); } else { |