diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-03-10 13:32:22 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-03-10 13:32:22 -0500 |
| commit | 250cc9c956021ce2cb8b56bae30cd01184807b7b (patch) | |
| tree | 7e02fe8d47e4af6c51fd47bd5800c3ed3b38551d /indra/newview/llviewertexture.h | |
| parent | fb00d280403b2befd645b8a80c3d9a3183e4c02c (diff) | |
| parent | 0c02401498521f87d38778df0e795960aa5445e1 (diff) | |
Automated merge up from viewer-development into mesh-development
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() ; |