diff options
author | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2021-06-10 09:25:50 +0000 |
---|---|---|
committer | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2021-06-10 09:25:50 +0000 |
commit | 0ea94d2948ba8237fd39fa0df219e07ee44c9ff1 (patch) | |
tree | 71b56d5d6937a66166ca17eb0413a4a88c363113 /indra/newview/llappviewer.h | |
parent | ce65bc2f13409d75dbc6502c970030cc5ed2e5ad (diff) | |
parent | 4623b822386accfae5907c88099c2a88377a0271 (diff) |
Merged master into DRTVWR-539
Diffstat (limited to 'indra/newview/llappviewer.h')
-rw-r--r-- | indra/newview/llappviewer.h | 3 |
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; |