diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-09-17 17:24:14 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-09-17 17:24:14 -0600 |
| commit | fc0a15ed5f5099556ad3fca3e07d92e974e6b9d4 (patch) | |
| tree | d7208da3be1e719d3509eaa9135cdff59d08a4b4 /indra/newview/llviewertexture.h | |
| parent | b5863a7723311ace7b288bc1eb6926b1221262ca (diff) | |
| parent | 556d3a1a4919e983ff02cb2704a7ad60255eb13c (diff) | |
Automated merge with http://bitbucket.org/seraph/viewer-development-shining
Diffstat (limited to 'indra/newview/llviewertexture.h')
| -rw-r--r-- | indra/newview/llviewertexture.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h index 7cb8bea4c8..b779396293 100644 --- a/indra/newview/llviewertexture.h +++ b/indra/newview/llviewertexture.h @@ -441,6 +441,7 @@ public: LLImageRaw* reloadRawImage(S8 discard_level) ; void destroyRawImage(); + bool needsToSaveRawImage(); const std::string& getUrl() const {return mUrl;} //--------------- @@ -532,6 +533,7 @@ protected: S8 mLoadedCallbackDesiredDiscardLevel; BOOL mPauseLoadedCallBacks; callback_list_t mLoadedCallbackList; + F32 mLastCallBackActiveTime; LLPointer<LLImageRaw> mRawImage; S32 mRawDiscardLevel; @@ -543,6 +545,7 @@ protected: //keep a copy of mRawImage for some special purposes //when mForceToSaveRawImage is set. BOOL mForceToSaveRawImage ; + BOOL mSaveRawImage; LLPointer<LLImageRaw> mSavedRawImage; S32 mSavedRawDiscardLevel; S32 mDesiredSavedRawDiscardLevel; |