diff options
| author | prep <prep@lindenlab.com> | 2012-11-28 16:36:34 -0500 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2012-11-28 16:36:34 -0500 |
| commit | e0432f98ee515f9777604aa784d28b63d2abfe40 (patch) | |
| tree | 398fcae43d9904bde2112a7085c7ef7c1a926100 /indra/newview/llviewertexture.h | |
| parent | bf87920fc91e2ca2b8d9f6f2656ad632c3005164 (diff) | |
| parent | f5a47417fde70f78b99744386c6da0bcf78e60d5 (diff) | |
SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance.
Diffstat (limited to 'indra/newview/llviewertexture.h')
| -rwxr-xr-x | indra/newview/llviewertexture.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h index 254a0cf92f..3df942d922 100755 --- a/indra/newview/llviewertexture.h +++ b/indra/newview/llviewertexture.h @@ -127,7 +127,9 @@ public: /*virtual*/ void forceImmediateUpdate() ; /*virtual*/ const LLUUID& getID() const { return mID; } - + void setBoostLevel(S32 level); + S32 getBoostLevel() { return mBoostLevel; } + void addTextureStats(F32 virtual_size, BOOL needs_gltexture = TRUE) const; void resetTextureStats(); void setMaxVirtualSizeResetInterval(S32 interval)const {mMaxVirtualSizeResetInterval = interval;} @@ -172,6 +174,7 @@ private: static bool isMemoryForTextureLow() ; protected: LLUUID mID; + F32 mSelectedTime; // time texture was last selected mutable F32 mMaxVirtualSize; // The largest virtual size of the image, in pixels - how much data to we need? mutable S32 mMaxVirtualSizeResetCounter ; mutable S32 mMaxVirtualSizeResetInterval; |