diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-17 14:56:01 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-17 14:56:01 -0400 |
| commit | f64a20ddcff91677b02b7688e08819cffb0989c9 (patch) | |
| tree | 707b1430e5b7ef2e27f4f34c66822e92dfffd294 /indra/newview/llviewertexture.cpp | |
| parent | c077250ff16aeaf0ec4c036154a427c677e85eb3 (diff) | |
| parent | 17d87b0fa5bdd8d15dbcd98e65c30ebf4e5b94ec (diff) | |
merge changes for storm-1016
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index cd16b15e3e..cf7f3f80ad 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -2691,12 +2691,10 @@ void LLViewerFetchedTexture::saveRawImage() mLastReferencedSavedRawImageTime = sCurrentTime ; } -void LLViewerFetchedTexture::forceToSaveRawImage(S32 desired_discard, bool from_callback) +void LLViewerFetchedTexture::forceToSaveRawImage(S32 desired_discard) { if(!mForceToSaveRawImage || mDesiredSavedRawDiscardLevel < 0 || mDesiredSavedRawDiscardLevel > desired_discard) { - llassert_always(from_callback || mBoostLevel == LLViewerTexture::BOOST_PREVIEW) ; - mForceToSaveRawImage = TRUE ; mDesiredSavedRawDiscardLevel = desired_discard ; |