diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-11-09 19:04:19 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-11-09 19:04:19 -0500 |
| commit | c3d6211b346195110314e25485ff4ff2a752f950 (patch) | |
| tree | 1e59024b20c5c06365d9aa1bf3c929635e18142e /indra/newview/llappviewer.h | |
| parent | 675f41b523e2fbdc36c5384161478c84ee12b02f (diff) | |
| parent | 51ee1f38029adce4804fc8f1d687ce3d50444388 (diff) | |
merge changes for storm-1850
Diffstat (limited to 'indra/newview/llappviewer.h')
| -rw-r--r-- | indra/newview/llappviewer.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index ae3c795d1e..095887d8c9 100644 --- a/indra/newview/llappviewer.h +++ b/indra/newview/llappviewer.h @@ -209,7 +209,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 @@ -229,7 +231,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; |