diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-15 09:26:58 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-15 09:26:58 -0400 |
| commit | 6faa6236f520fd1dbbbbe030957a6354f5c45db3 (patch) | |
| tree | 907614751c28c888ae7f5ea725a681b34b2f48f0 /indra/newview/llviewertexture.cpp | |
| parent | 174b537953b5a39702c833ab1e83313a80e5e549 (diff) | |
| parent | ae3e97024ec60d2c0555bf01ff6e2786232b6dd5 (diff) | |
merge changes for storm-28
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 ; |