diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-03-18 10:31:12 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-03-18 10:31:12 -0600 |
| commit | 1900b5f4100a94cf89181a077102f248f9dc80fe (patch) | |
| tree | 275715201cc54935f29201f4fe009209f21c919a /indra/newview/llviewertexture.cpp | |
| parent | c86f61fd313a9f64dd0f1c5d100f39d6a3cb8eb0 (diff) | |
| parent | 56ccf4d0befca4c98d1d13f757b515bde1d3e262 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 133b6ee8c9..dbbf0219c9 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -2262,11 +2262,14 @@ void LLViewerFetchedTexture::destroyRawImage() { sRawCount--; - if(mForceToSaveRawImage) + if(mIsRawImageValid) { - saveRawImage() ; - } - setCachedRawImage() ; + if(mForceToSaveRawImage) + { + saveRawImage() ; + } + setCachedRawImage() ; + } } mRawImage = NULL; |