diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-04-27 00:00:07 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-04-27 00:00:07 -0700 |
| commit | 793d8a4f62952fa4fa482a5f43dc1b422c195dc2 (patch) | |
| tree | 70314de695fac0ebfdc215f94c9da8c9fb1f9270 /indra/newview/llviewertexture.cpp | |
| parent | e1ddeb5364d53cfa834d9651d079d8913083263a (diff) | |
| parent | e703232cae0e692c813ba119e283ffd2d150fec8 (diff) | |
Pull merge from drano-sh-3086
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 49faae3fdb..6137b7176f 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -722,11 +722,14 @@ void LLViewerTexture::forceImmediateUpdate() void LLViewerTexture::addTextureStats(F32 virtual_size, BOOL needs_gltexture) const { + static LLCachedControl<F32> sTexelPixelRatio(gSavedSettings,"TexelPixelRatio"); + if(needs_gltexture) { mNeedsGLTexture = TRUE ; } + virtual_size *= sTexelPixelRatio; if(!mMaxVirtualSizeResetCounter) { //flag to reset the values because the old values are used. @@ -2144,6 +2147,14 @@ bool LLViewerFetchedTexture::updateFetch() return mIsFetching ? true : false; } +void LLViewerFetchedTexture::clearFetchedResults() +{ + llassert_always(!mNeedsCreateTexture && !mIsFetching); + + cleanup(); + destroyGLTexture(); +} + void LLViewerFetchedTexture::forceToDeleteRequest()
{
if (mHasFetcher)
|