diff options
author | callum <none@none> | 2011-03-09 15:34:43 -0800 |
---|---|---|
committer | callum <none@none> | 2011-03-09 15:34:43 -0800 |
commit | aac70bccada903098bd5a5074d7c4e347ddbef03 (patch) | |
tree | 66d7626379646f2eb385566e5d5098e95ebb3cd2 /indra/newview/llviewertexture.h | |
parent | 90c824d10dbf4468dfdd9ffebf7456f81964391a (diff) | |
parent | 0c02401498521f87d38778df0e795960aa5445e1 (diff) |
Merge with tip of http://hg.secondlife.com/viewer-development (rev 14798)
Diffstat (limited to 'indra/newview/llviewertexture.h')
-rw-r--r-- | indra/newview/llviewertexture.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h index b5636bbdc7..d512f8ec3a 100644 --- a/indra/newview/llviewertexture.h +++ b/indra/newview/llviewertexture.h @@ -465,7 +465,7 @@ public: S32 getCachedRawImageLevel() const {return mCachedRawDiscardLevel;} BOOL isCachedRawImageReady() const {return mCachedRawImageReady ;} BOOL isRawImageValid()const { return mIsRawImageValid ; } - void forceToSaveRawImage(S32 desired_discard = 0, bool from_callback = false) ; + void forceToSaveRawImage(S32 desired_discard = 0) ; /*virtual*/ void setCachedRawImage(S32 discard_level, LLImageRaw* imageraw) ; void destroySavedRawImage() ; LLImageRaw* getSavedRawImage() ; |