diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-03-11 14:33:24 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-03-11 14:33:24 -0800 |
| commit | 3011e697c34ac6ad1ce95b435c487f8da20fb5e2 (patch) | |
| tree | 57fef4c1a3430c07cf1cb682c1a1784282cad7d3 /indra/newview/llviewertexture.cpp | |
| parent | e342c522b4bb5efd8eb9687efddfe47199e02395 (diff) | |
| parent | d0b457365145233c3b4bc64991b183722b13fac8 (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 ; |