diff options
| author | Tofu Buzzard <no-email> | 2011-03-10 12:14:01 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-03-10 12:14:01 -0800 |
| commit | c1f01016cfc4dd908c1f73b815cddb1b6b35194d (patch) | |
| tree | f089fd509a7829c99d904888f50ed256dc19ce34 /indra/newview/llviewertexture.cpp | |
| parent | 59c0059afa700661a3342a61e54164a8cf7446c3 (diff) | |
| parent | 3c37aa1c19599a02d0652d78d46d55214085a832 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
| -rwxr-xr-x | 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 34b0ae9f02..5cd2881e2a 100755 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -2698,12 +2698,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 ; |