diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-11-10 22:39:11 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-11-10 22:39:11 -0800 |
| commit | 0e07758b540374aa421d2938ce5ed13e2b9eefe4 (patch) | |
| tree | 145600f9494489b686e13b53edc7f10d75afa0e3 /indra/newview/llappviewer.h | |
| parent | 4bbe823302427a705ea541d968f6058571a13c2f (diff) | |
| parent | 61fbc02deb08c1a69b8c24498fe559359496ac91 (diff) | |
merge with STORM-105 and viewer-development
Diffstat (limited to 'indra/newview/llappviewer.h')
| -rw-r--r-- | indra/newview/llappviewer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index 3bdc6325c1..a14ab4362f 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. @@ -253,7 +253,7 @@ private: // For performance and metric gathering LLThread* mFastTimerLogThread; - + // for tracking viewer<->region circuit death bool mAgentRegionLastAlive; LLUUID mAgentRegionLastID; |