diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-11-04 18:09:35 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-11-04 18:09:35 -0700 |
| commit | ba3307b8d0f2ceb40454174a6593f3f98ce98b65 (patch) | |
| tree | 7c016ab72795543361d206de5344b34a6a823fdf /indra/newview/llappviewer.h | |
| parent | dac53830f1a67c8657ced9c39eccedbadf149bd9 (diff) | |
| parent | 40979589afc5c91cab977307a1e400315b1c8a8f (diff) | |
merge with STORM-105
Diffstat (limited to 'indra/newview/llappviewer.h')
| -rw-r--r-- | indra/newview/llappviewer.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index 56d88f07c8..6421f3fd6f 100644 --- a/indra/newview/llappviewer.h +++ b/indra/newview/llappviewer.h @@ -167,7 +167,7 @@ public: // mute/unmute the system's master audio virtual void setMasterSystemAudioMute(bool mute); virtual bool getMasterSystemAudioMute(); - + protected: virtual bool initWindow(); // Initialize the viewer's window. virtual bool initLogging(); // Initialize log files, logging system, return false on failure. @@ -204,6 +204,8 @@ private: void idle(); void idleShutdown(); + // update avatar SLID and display name caches + void idleNameCache(); void idleNetwork(); void sendLogoutRequest(); @@ -249,7 +251,9 @@ private: LLWatchdogTimeout* mMainloopTimeout; + // For performance and metric gathering LLThread* mFastTimerLogThread; + // for tracking viewer<->region circuit death bool mAgentRegionLastAlive; LLUUID mAgentRegionLastID; |