diff options
author | Don Kjer <don@lindenlab.com> | 2010-12-16 19:20:13 -0800 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2010-12-16 19:20:13 -0800 |
commit | 168b6d545ae952db85a608fdd00ec6605e7a66cf (patch) | |
tree | 90d37b8a0272f8cf12f9e31bf6229d229a1bfea6 /indra/newview/llappviewer.cpp | |
parent | b9acc0285cd5026fdd22f4f35c1cfdcb1258155e (diff) | |
parent | 3aa8a883ebf5865045afb3b1577e1cfcaa6b9045 (diff) |
Merge from don_linden/viewer-dev
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r-- | indra/newview/llappviewer.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index b460885a53..984e1c20db 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -44,6 +44,7 @@ #include "llagentwearables.h" #include "llwindow.h" #include "llviewerstats.h" +#include "llviewerstatsrecorder.h" #include "llmd5.h" #include "llpumpio.h" #include "llmimetypes.h" @@ -651,6 +652,10 @@ bool LLAppViewer::init() mAlloc.setProfilingEnabled(gSavedSettings.getBOOL("MemProfiling")); +#if LL_RECORD_VIEWER_STATS + LLViewerStatsRecorder::initClass(); +#endif + // *NOTE:Mani - LLCurl::initClass is not thread safe. // Called before threads are created. LLCurl::initClass(); @@ -959,6 +964,8 @@ bool LLAppViewer::init() LLAgentLanguage::init(); + + return true; } @@ -1679,6 +1686,10 @@ bool LLAppViewer::cleanup() } LLMetricPerformanceTesterBasic::cleanClass() ; +#if LL_RECORD_VIEWER_STATS + LLViewerStatsRecorder::cleanupClass(); +#endif + llinfos << "Cleaning up Media and Textures" << llendflush; //Note: |