diff options
| author | Glenn Glazer <coyot@lindenlab.com> | 2016-05-25 08:12:47 -0700 |
|---|---|---|
| committer | Glenn Glazer <coyot@lindenlab.com> | 2016-05-25 08:12:47 -0700 |
| commit | 67438c67aba96fe51dd29eee52bd332286dd2130 (patch) | |
| tree | 5c10eacc151dfedcf0afcccd97da045169d5d704 /indra/newview/llviewertexture.cpp | |
| parent | 9908fcf4ac43537728d1b34e30650735cfb36147 (diff) | |
| parent | fb598cd380b38714abed554b8feacabfc55b2aaa (diff) | |
pull from lynx
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
| -rw-r--r--[-rwxr-xr-x] | indra/newview/llviewertexture.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index c5e07f009f..ed719ae418 100755..100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -1118,6 +1118,7 @@ void LLViewerFetchedTexture::init(bool firstinit) mLastCallBackActiveTime = 0.f; mForceCallbackFetch = FALSE; mInDebug = FALSE; + mUnremovable = FALSE; mFTType = FTT_UNKNOWN; } @@ -1874,7 +1875,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; } |