diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-06-07 21:08:43 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-06-07 21:08:43 +0300 |
| commit | 7587f0dd88526e61a4741ad8e2d9894027de1ffb (patch) | |
| tree | 5046dba2ef946683f7360b2b0883c9c24b6147ae /indra/newview/llappviewer.h | |
| parent | 3fcc1739663f939c6c67415f1d56b64c35a52a38 (diff) | |
| parent | 4623b822386accfae5907c88099c2a88377a0271 (diff) | |
Merge branch 'master' into DRTVWR-483
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; |