diff options
author | Richard Linden <none@none> | 2013-08-14 11:51:49 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2013-08-14 11:51:49 -0700 |
commit | 26581404e426b00cd0a07c38b5cb858d5d5faa28 (patch) | |
tree | f2a9a512fac56b7ce4f5f643617346e05c0a2992 /indra/newview/llviewertexturelist.h | |
parent | 9faaa28f4445425e8c5b7b002faffbe0365b905d (diff) |
BUILDFIX: added header for numeric_limits support on gcc
added convenience types for units F32Seconds, etc.
Diffstat (limited to 'indra/newview/llviewertexturelist.h')
-rwxr-xr-x | indra/newview/llviewertexturelist.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llviewertexturelist.h b/indra/newview/llviewertexturelist.h index 5b6e927e32..673b55be69 100755 --- a/indra/newview/llviewertexturelist.h +++ b/indra/newview/llviewertexturelist.h @@ -101,8 +101,8 @@ public: void setUpdateStats(BOOL b) { mUpdateStats = b; } - S32 getMaxResidentTexMem() const { return mMaxResidentTexMemInMegaBytes; } - S32 getMaxTotalTextureMem() const { return mMaxTotalTextureMemInMegaBytes;} + LLUnit<S32, LLUnits::Mibibytes> getMaxResidentTexMem() const { return mMaxResidentTexMemInMegaBytes; } + LLUnit<S32, LLUnits::Mibibytes> getMaxTotalTextureMem() const { return mMaxTotalTextureMemInMegaBytes;} S32 getNumImages() { return mImageList.size(); } void updateMaxResidentTexMem(S32 mem); @@ -200,8 +200,8 @@ private: BOOL mInitialized ; BOOL mUpdateStats; - S32 mMaxResidentTexMemInMegaBytes; - S32 mMaxTotalTextureMemInMegaBytes; + LLUnit<S32, LLUnits::Mibibytes> mMaxResidentTexMemInMegaBytes; + LLUnit<S32, LLUnits::Mibibytes> mMaxTotalTextureMemInMegaBytes; LLFrameTimer mForceDecodeTimer; private: |