diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-28 20:35:02 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-28 20:35:02 +0100 |
| commit | 15039662f2aeef72a799d8a9a474ebe4141dd7cc (patch) | |
| tree | aa5be61cae72542b0742f243bd7097570e9ab3fc /indra/newview/llvoavatar.cpp | |
| parent | 3e1100dbfa8549e8738bc68b5a4a2e5d36a0da85 (diff) | |
| parent | a5c9e30fc806cc8cf291b7da0fd4133ca8241fed (diff) | |
merge from viewer-public
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 7300315591..14267d10ff 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -5878,10 +5878,9 @@ void LLVOAvatar::updateRuthTimer(bool loading) mRuthDebugTimer.reset(); } - const F32 LOADING_TIMEOUT = 120.f; - if (mRuthTimer.getElapsedTimeF32() > LOADING_TIMEOUT) + const F32 LOADING_TIMEOUT__SECONDS = 120.f; + if (mRuthTimer.getElapsedTimeF32() > LOADING_TIMEOUT__SECONDS) { - llinfos << "Ruth Timer timeout: Missing texture data for '" << getFullname() << "' " << "( Params loaded : " << !visualParamWeightsAreDefault() << " ) " << "( Lower : " << isTextureDefined(TEX_LOWER_BAKED) << " ) " |