diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2021-06-29 10:48:02 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2021-06-29 10:48:02 -0400 |
| commit | 2e790e9b7250d5f79751fa5287c1993f3fa5c776 (patch) | |
| tree | 60dd4f9462ba11a4cb7503c64fa1dd2a23373a67 /indra/newview/llappviewer.h | |
| parent | 1eeb4c85a120b23b853aabb8e6cf984b03dbc17f (diff) | |
| parent | 467d8339c970c253dada2cf0e1eed45be66593ac (diff) | |
DRTVWR-538: Merge branch 'master' into c++17
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; |