diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-11 08:09:32 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-11 08:09:32 +0100 |
| commit | 51f77668153ec3d5b8b7a73beef6f718e65be568 (patch) | |
| tree | cb895b2412efab658b508cb8722fd7cf47876e6e /indra/newview/llviewertexture.cpp | |
| parent | 28c78888ae565ae29102f58bd1494a3cbb52a5d0 (diff) | |
| parent | 79a3870c4fdaaeb68f8ff70857e8a48e0af3b5ce (diff) | |
EXT-7464 Sandbox test of palmer/viewer-trunk (Deferred rendering turned off, but fixes merged in)
The merge.
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 7e779986df..9b5b210bf7 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -541,11 +541,6 @@ void LLViewerTexture::setBoostLevel(S32 level) if(mBoostLevel != LLViewerTexture::BOOST_NONE) { setNoDelete() ; - - if(LLViewerTexture::BOOST_AVATAR_BAKED_SELF == mBoostLevel || LLViewerTexture::BOOST_AVATAR_BAKED == mBoostLevel) - { - mCanResetMaxVirtualSize = false ; - } } if(gAuditTexture) { @@ -596,6 +591,11 @@ void LLViewerTexture::forceImmediateUpdate() { } +void LLViewerTexture::setResetMaxVirtualSizeFlag(bool flag) +{ + mCanResetMaxVirtualSize = flag ; +} + void LLViewerTexture::addTextureStats(F32 virtual_size, BOOL needs_gltexture) const { if(needs_gltexture) |