summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturecache.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-09-25 19:15:38 -0700
committerRichard Linden <none@none>2013-09-25 19:15:38 -0700
commit1aec07aecfd1a39adf83589473cd7c3cfbc1cd76 (patch)
tree73cffad3bcac98ee86f4368aebdd8a37ab0ead02 /indra/newview/lltexturecache.h
parent4aa41f80bae421109900321af1d090ba5c8e6fdb (diff)
parent053d97db1b283ca2548dc1f64756ddfc5166158f (diff)
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/lltexturecache.h')
-rwxr-xr-xindra/newview/lltexturecache.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltexturecache.h b/indra/newview/lltexturecache.h
index c2a5cf9405..6ff4c44568 100755
--- a/indra/newview/lltexturecache.h
+++ b/indra/newview/lltexturecache.h
@@ -131,8 +131,8 @@ public:
// debug
S32 getNumReads() { return mReaders.size(); }
S32 getNumWrites() { return mWriters.size(); }
- S64 getUsage() { return mTexturesSizeTotal; }
- S64 getMaxUsage() { return sCacheMaxTexturesSize; }
+ S64Bytes getUsage() { return S64Bytes(mTexturesSizeTotal); }
+ S64Bytes getMaxUsage() { return S64Bytes(sCacheMaxTexturesSize); }
U32 getEntries() { return mHeaderEntriesInfo.mEntries; }
U32 getMaxEntries() { return sCacheMaxEntries; };
BOOL isInCache(const LLUUID& id) ;