summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-06-03 17:49:51 -0400
committerOz Linden <oz@lindenlab.com>2013-06-03 17:49:51 -0400
commitdd2ede9991a9a31821fbe43a7fa17a5aafa19542 (patch)
tree9bc024d6a9a5b3cdcda7b40048f4c207edc3408d /indra/newview/llappviewer.h
parentf3def8fce601bb29634667ab215cc5f00408ffa9 (diff)
Fix and organize code for managing marker files that detect last_exec_event and last_exec_duration
Diffstat (limited to 'indra/newview/llappviewer.h')
-rwxr-xr-xindra/newview/llappviewer.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h
index d3a8cf24d9..cd91ae8b2b 100755
--- a/indra/newview/llappviewer.h
+++ b/indra/newview/llappviewer.h
@@ -183,7 +183,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();
@@ -215,8 +215,7 @@ 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;