diff options
| author | Eli Linden <eli@lindenlab.com> | 2011-03-10 12:18:27 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2011-03-10 12:18:27 -0800 |
| commit | 70aff7fd157b1e2894a4d065caf9a63848d072b0 (patch) | |
| tree | dee262d1b7ac3ef14eebeb71d55e9b0755209148 /indra/newview/llviewertexture.cpp | |
| parent | 64e672d9d92d1b8f92e968b0164b2212a71120da (diff) | |
| parent | 378585e7f089b62b7a0dd69adde48cd63fc7bacc (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 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 ; |