summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-10-31 21:22:52 -0400
committerOz Linden <oz@lindenlab.com>2012-10-31 21:22:52 -0400
commit060a76daa695e8619db48bf940ea3997668702d0 (patch)
tree82035c3e0be4894585f6024734238afc6af2ade7 /indra/newview/llappviewer.h
parent699fe4369949ba03959312c90335ac37d80ac275 (diff)
storm-1850: ensure that last exec event reports apply only to the same version
Diffstat (limited to 'indra/newview/llappviewer.h')
-rw-r--r--indra/newview/llappviewer.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h
index 69056074e9..c8fb023150 100644
--- a/indra/newview/llappviewer.h
+++ b/indra/newview/llappviewer.h
@@ -217,7 +217,9 @@ private:
bool anotherInstanceRunning();
void initMarkerFile();
-
+ 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
@@ -237,7 +239,7 @@ private:
LLAPRFile mMarkerFile; // A file created to indicate the app is running.
std::string mLogoutMarkerFileName;
- apr_file_t* mLogoutMarkerFile; // A file created to indicate the app is running.
+ LLAPRFile mLogoutMarkerFile; // A file created to indicate the app is running.
LLOSInfo mSysOSInfo;