diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-03-23 11:36:00 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-03-23 11:36:00 -0700 |
| commit | 3ad81bb4a642d25018b773d2ef005380664d8170 (patch) | |
| tree | b1bbf66c0babf6c541858b34d4a7f66ad19308b0 /indra/newview/llviewertexture.cpp | |
| parent | a2c659378b8b7c8a4128c61b5cde91eccc9db4e6 (diff) | |
| parent | 62a958d341532287519a23a362ff7aebd501e1c9 (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 ; |