summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexturelist.h
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2018-03-01 19:38:21 -0500
committerNat Goodspeed <nat@lindenlab.com>2018-03-01 19:38:21 -0500
commit12ccb65603ec50ac80d85c4e023ec8e026c9e1f2 (patch)
treef7bfc4b64718278041f46e1759f5de27c9d83864 /indra/newview/llviewertexturelist.h
parent2e87bac8f9983faa6a1e46ee626d688a101fa070 (diff)
parent3c7086d4fff6c370f8ce2be51cab2502f663aab1 (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-451
Diffstat (limited to 'indra/newview/llviewertexturelist.h')
-rw-r--r--indra/newview/llviewertexturelist.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llviewertexturelist.h b/indra/newview/llviewertexturelist.h
index 070544063a..281d23c671 100644
--- a/indra/newview/llviewertexturelist.h
+++ b/indra/newview/llviewertexturelist.h
@@ -124,8 +124,6 @@ public:
void handleIRCallback(void **data, const S32 number);
- void setUpdateStats(BOOL b) { mUpdateStats = b; }
-
S32Megabytes getMaxResidentTexMem() const { return mMaxResidentTexMemInMegaBytes; }
S32Megabytes getMaxTotalTextureMem() const { return mMaxTotalTextureMemInMegaBytes;}
S32 getNumImages() { return mImageList.size(); }
@@ -224,7 +222,6 @@ private:
std::set<LLPointer<LLViewerFetchedTexture> > mImagePreloads;
BOOL mInitialized ;
- BOOL mUpdateStats;
S32Megabytes mMaxResidentTexMemInMegaBytes;
S32Megabytes mMaxTotalTextureMemInMegaBytes;
LLFrameTimer mForceDecodeTimer;