diff options
| author | Richard Linden <none@none> | 2012-09-06 11:47:48 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-09-06 11:47:48 -0700 |
| commit | 371b66a6ef7eb2568e3127c1c59326bce6e26ab8 (patch) | |
| tree | 9154fa799fc37df8cb493f921b41ad79596e903c /indra/newview/llviewertexture.cpp | |
| parent | e3b4b3875a6d8c7857ba948a662ace4731913ecf (diff) | |
| parent | 2cdfb170216c798c637081b0e28ec8921f0b777b (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 8eb8717de2..b0f8f60d1e 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -39,7 +39,6 @@ #include "llimagebmp.h" #include "llimagej2c.h" #include "llimagetga.h" -#include "llmemtype.h" #include "llstl.h" #include "llvfile.h" #include "llvfs.h" @@ -413,8 +412,8 @@ void LLViewerTexture::initClass() if(gSavedSettings.getBOOL("TextureFetchDebuggerEnabled")) { - sTexelPixelRatio = gSavedSettings.getF32("TexelPixelRatio"); - } + sTexelPixelRatio = gSavedSettings.getF32("TexelPixelRatio"); +} } // static @@ -2240,7 +2239,7 @@ void LLViewerFetchedTexture::forceToDeleteRequest() mIsFetching = FALSE ; } - resetTextureStats(); + resetTextureStats(); mDesiredDiscardLevel = getMaxDiscardLevel() + 1; } @@ -2289,9 +2288,9 @@ void LLViewerFetchedTexture::setLoadedCallback( loaded_callback_func loaded_call if(mPauseLoadedCallBacks) { if(!pause) - { - unpauseLoadedCallbacks(src_callback_list) ; - } + { + unpauseLoadedCallbacks(src_callback_list) ; + } } else if(pause) { |