summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.h
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2021-06-07 21:05:12 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2021-06-07 21:05:12 +0300
commit323f41f4892248762fc8505d8df17d70bd833cf3 (patch)
treed59a23a4cf9603e95a5bb0f7ae705657e342a799 /indra/newview/llappviewer.h
parent024032c6745300a0cde75ad404e73a7ddff61534 (diff)
parent4623b822386accfae5907c88099c2a88377a0271 (diff)
Merge branch 'master' into DRTVWR-540-maint
Diffstat (limited to 'indra/newview/llappviewer.h')
-rw-r--r--indra/newview/llappviewer.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h
index d24cdcedc7..5ceb540784 100644
--- a/indra/newview/llappviewer.h
+++ b/indra/newview/llappviewer.h
@@ -235,7 +235,6 @@ private:
bool initConfiguration(); // Initialize settings from the command line/config file.
void initStrings(); // Initialize LLTrans machinery
bool initCache(); // Initialize local client cache.
- void checkMemory() ;
// We have switched locations of both Mac and Windows cache, make sure
// files migrate and old cache is cleared out.
@@ -314,8 +313,6 @@ private:
LLAllocator mAlloc;
- LLFrameTimer mMemCheckTimer;
-
// llcorehttp library init/shutdown helper
LLAppCoreHttp mAppCoreHttp;