diff options
| author | leyla <leyla@leyla.com> | 2011-03-14 11:28:13 -0700 |
|---|---|---|
| committer | leyla <leyla@leyla.com> | 2011-03-14 11:28:13 -0700 |
| commit | c762beed267115b7670e01219ccff4fc64bdca4c (patch) | |
| tree | 8ee42a8defd3bae58759a9dd3517385d830c52b8 /indra/newview/llviewertexture.cpp | |
| parent | bc2aca863f5d27f551e48a2de8f879360a3a96ab (diff) | |
| parent | 405a748746c8ea040fe0efeda54e58f378289795 (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 ; |