diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2012-05-04 18:17:20 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2012-05-04 18:17:20 -0600 |
| commit | f86592e34e47b9f5b0e39c20b0e16d1367a311b9 (patch) | |
| tree | 2ad6181d57269569f8eb49f527398ae2f6b7c858 /indra/newview/llviewertexture.cpp | |
| parent | 32c024c41d8edb2bbf5441178d83f3365182ed61 (diff) | |
| parent | 0afca8603a56205df4c4e310387651726cbfbe3c (diff) | |
Automated merge with https://bitbucket.org/VirLinden/drano
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 684d1afa4f..511fc13973 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -409,7 +409,11 @@ void LLViewerTextureManager::cleanup() void LLViewerTexture::initClass() { LLImageGL::sDefaultGLTexture = LLViewerFetchedTexture::sDefaultImagep->getGLTexture() ; - sTexelPixelRatio = gSavedSettings.getF32("TexelPixelRatio"); + + if(gSavedSettings.getBOOL("TextureFetchDebuggerEnabled")) + { + sTexelPixelRatio = gSavedSettings.getF32("TexelPixelRatio"); + } } // static @@ -2168,7 +2172,10 @@ bool LLViewerFetchedTexture::updateFetch() void LLViewerFetchedTexture::clearFetchedResults() { - llassert_always(!mNeedsCreateTexture && !mIsFetching); + if(mNeedsCreateTexture || mIsFetching) + { + return ; + } cleanup(); destroyGLTexture(); |