Merged in andreyl_productengine/viewer-lion-marchcat (pull request #37)

MAINT-6376 Disable loading surface textures in the wireframe mode
meow-7.2.2
Andrey Lihatskiy 2016-05-06 19:55:46 +03:00
commit 8e91c90ca3
1 changed files with 2 additions and 1 deletions

View File

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