diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-03-17 23:19:39 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-03-17 23:19:39 -0700 |
| commit | bce92b3ec6d3efb4a2938f35ba7e1803b4b57145 (patch) | |
| tree | 76c0ded54ebe614d74d4ad4b577d41abc2630c3a /indra/newview/llviewertexture.cpp | |
| parent | d63c1a4df14f5eaeee37b82890a445e912d60683 (diff) | |
| parent | 741de388d38290cbb946070a8380f492971dfd2e (diff) | |
Pull in merov_linden/viewer-autobuild2010
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 ; |