diff options
| author | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2016-05-06 19:55:46 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2016-05-06 19:55:46 +0300 |
| commit | 8e91c90ca3ea00ea992783be61263553573e221b (patch) | |
| tree | 160cbb399f304bdc7f06fbdebd377678bdae268b | |
| parent | 7c09c648780d79cc240b76c9cb26e4bd1c0a8df2 (diff) | |
| parent | 51cf02086a5f172bb49872945aa66e72fd5db561 (diff) | |
Merged in andreyl_productengine/viewer-lion-marchcat (pull request #37)
MAINT-6376 Disable loading surface textures in the wireframe mode
| -rwxr-xr-x | indra/newview/llviewertexture.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index c5e07f009f..565e83811f 100755 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -1874,7 +1874,8 @@ bool LLViewerFetchedTexture::updateFetch() static LLCachedControl<bool> textures_decode_disabled(gSavedSettings,"TextureDecodeDisabled", false); static LLCachedControl<F32> sCameraMotionThreshold(gSavedSettings,"TextureCameraMotionThreshold", 0.2); static LLCachedControl<S32> sCameraMotionBoost(gSavedSettings,"TextureCameraMotionBoost", 3); - if(textures_decode_disabled) + if(textures_decode_disabled || + (gUseWireframe && mBoostLevel < LLGLTexture::BOOST_AVATAR_BAKED_SELF)) // don't fetch the surface textures in wireframe mode { return false; } |