diff options
Diffstat (limited to 'indra/newview/llappviewer.h')
| -rwxr-xr-x | indra/newview/llappviewer.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index ad662d8ea1..68e9ebeff3 100755 --- a/indra/newview/llappviewer.h +++ b/indra/newview/llappviewer.h @@ -186,7 +186,7 @@ public: protected: virtual bool initWindow(); // Initialize the viewer's window. - virtual void initLogging(); // Initialize log files, logging system + virtual void initLoggingAndGetLastDuration(); // Initialize log files, logging system virtual void initConsole() {}; // Initialize OS level debugging console. virtual bool initHardwareTest() { return true; } // A false result indicates the app should quit. virtual bool initSLURLHandler(); @@ -218,11 +218,10 @@ private: void writeSystemInfo(); // Write system info to "debug_info.log" - bool anotherInstanceRunning(); - void initMarkerFile(); + void processMarkerFiles(); static void recordMarkerVersion(LLAPRFile& marker_file); bool markerIsSameVersion(const std::string& marker_name) const; - + void idle(); void idleShutdown(); // update avatar SLID and display name caches |