diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-03-15 09:10:39 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-03-15 09:10:39 -0700 |
| commit | 57ac771b154d7722e4774b40a607a11f3286f472 (patch) | |
| tree | 20a555064cedcbdd6bbea3dbeeb866f95601ba19 /indra/newview/llviewertexture.cpp | |
| parent | 18ae6c639e58c4c996d4c3b2a4b34ef41deab970 (diff) | |
| parent | bc0833d5db9e887f72ea6e7a630781203ad6ad77 (diff) | |
Merge
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 16e73da79b..cc635f71f9 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -2689,12 +2689,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 ; |