aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerimagelist.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llviewerimagelist.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llviewerimagelist.h b/linden/indra/newview/llviewerimagelist.h
index 501c666..5fad0a2 100644
--- a/linden/indra/newview/llviewerimagelist.h
+++ b/linden/indra/newview/llviewerimagelist.h
@@ -130,8 +130,8 @@ public:
130 130
131 void setUpdateStats(BOOL b) { mUpdateStats = b; } 131 void setUpdateStats(BOOL b) { mUpdateStats = b; }
132 132
133 S32 getMaxResidentTexMem() const { return mMaxResidentTexMem; } 133 S32 getMaxResidentTexMem() const { return mMaxResidentTexMemInMegaBytes; }
134 S32 getMaxTotalTextureMem() const { return mMaxTotalTextureMem;} 134 S32 getMaxTotalTextureMem() const { return mMaxTotalTextureMemInMegaBytes;}
135 S32 getNumImages() { return mImageList.size(); } 135 S32 getNumImages() { return mImageList.size(); }
136 136
137 void updateMaxResidentTexMem(S32 mem); 137 void updateMaxResidentTexMem(S32 mem);
@@ -172,8 +172,8 @@ private:
172 std::set<LLPointer<LLViewerImage> > mImagePreloads; 172 std::set<LLPointer<LLViewerImage> > mImagePreloads;
173 173
174 BOOL mUpdateStats; 174 BOOL mUpdateStats;
175 S32 mMaxResidentTexMem; 175 S32 mMaxResidentTexMemInMegaBytes;
176 S32 mMaxTotalTextureMem; 176 S32 mMaxTotalTextureMemInMegaBytes;
177 LLFrameTimer mForceDecodeTimer; 177 LLFrameTimer mForceDecodeTimer;
178 178
179public: 179public: