aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerimagelist.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-12-01 17:39:58 -0600
committerJacek Antonelli2008-12-01 17:40:06 -0600
commit7abecb48babe6a6f09bf6692ba55076546cfced9 (patch)
tree8d18a88513fb97adf32c10aae78f4be1984942db /linden/indra/newview/llviewerimagelist.h
parentSecond Life viewer sources 1.21.6 (diff)
downloadmeta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.zip
meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.gz
meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.bz2
meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.xz
Second Life viewer sources 1.22.0-RC
Diffstat (limited to 'linden/indra/newview/llviewerimagelist.h')
-rw-r--r--linden/indra/newview/llviewerimagelist.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewerimagelist.h b/linden/indra/newview/llviewerimagelist.h
index 8aa9913..1f1a122 100644
--- a/linden/indra/newview/llviewerimagelist.h
+++ b/linden/indra/newview/llviewerimagelist.h
@@ -129,6 +129,7 @@ public:
129 void setUpdateStats(BOOL b) { mUpdateStats = b; } 129 void setUpdateStats(BOOL b) { mUpdateStats = b; }
130 130
131 S32 getMaxResidentTexMem() const { return mMaxResidentTexMem; } 131 S32 getMaxResidentTexMem() const { return mMaxResidentTexMem; }
132 S32 getMaxTotalTextureMem() const { return mMaxTotalTextureMem;}
132 S32 getNumImages() { return mImageList.size(); } 133 S32 getNumImages() { return mImageList.size(); }
133 134
134 void updateMaxResidentTexMem(S32 mem); 135 void updateMaxResidentTexMem(S32 mem);
@@ -170,6 +171,7 @@ private:
170 171
171 BOOL mUpdateStats; 172 BOOL mUpdateStats;
172 S32 mMaxResidentTexMem; 173 S32 mMaxResidentTexMem;
174 S32 mMaxTotalTextureMem;
173 LLFrameTimer mForceDecodeTimer; 175 LLFrameTimer mForceDecodeTimer;
174 176
175public: 177public: