diff options
| author | Tofu Buzzard <no-email> | 2011-03-10 12:13:13 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-03-10 12:13:13 -0800 |
| commit | 3c37aa1c19599a02d0652d78d46d55214085a832 (patch) | |
| tree | b7ff0c23ad88c6e5ed17d9cb809908323dbc6265 /indra/newview/llviewertexture.cpp | |
| parent | 5c6f86e158b547a0a686a3ab9d01d55b3787e48c (diff) | |
| parent | 250cc9c956021ce2cb8b56bae30cd01184807b7b (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 ; |