diff options
author | Dave SIMmONs <simon@lindenlab.com> | 2010-11-12 12:24:15 -0800 |
---|---|---|
committer | Dave SIMmONs <simon@lindenlab.com> | 2010-11-12 12:24:15 -0800 |
commit | 187b21e6d22204e8989b1c7d5e75f8b7880dd79f (patch) | |
tree | 8f60e069433afa48fc9a20ecc165863a0108c1aa /indra/newview/llappviewer.h | |
parent | e3677f9ee2223cc13d12456e1eee4f7f9a90c474 (diff) | |
parent | 5b86f60a13f28f5978ff3a53371cb3bae7f0d837 (diff) |
Merge latest from lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llappviewer.h')
-rw-r--r-- | indra/newview/llappviewer.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index a40cd83182..a14ab4362f 100644 --- a/indra/newview/llappviewer.h +++ b/indra/newview/llappviewer.h @@ -251,7 +251,9 @@ private: LLWatchdogTimeout* mMainloopTimeout; + // For performance and metric gathering LLThread* mFastTimerLogThread; + // for tracking viewer<->region circuit death bool mAgentRegionLastAlive; LLUUID mAgentRegionLastID; |