1 files changed, 9 insertions, 9 deletions

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index a57050d..cdecaf4 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -2487,7 +2487,7 @@ void LLAppViewer::handleViewerCrash()
                 llinfos << "Creating crash marker file " << crash_file_name << llendl;
                 
                 LLAPRFile crash_file ;
-                crash_file.open(crash_file_name, LL_APR_W);
+                crash_file.open(crash_file_name, LL_APR_W, LLAPRFile::local);
                 if (crash_file.getFileHandle())
                 {
                         LL_INFOS("MarkerFile") << "Created crash marker file " << crash_file_name << LL_ENDL;
@@ -2555,11 +2555,11 @@ bool LLAppViewer::anotherInstanceRunning()
         LL_DEBUGS("MarkerFile") << "Checking marker file for lock..." << LL_ENDL;
 
         //Freeze case checks
-        if (LLAPRFile::isExist(marker_file, NULL, LL_APR_RB))
+        if (LLAPRFile::isExist(marker_file, LL_APR_RB))
         {
                 // File exists, try opening with write permissions
                 LLAPRFile outfile ;
-                outfile.open(marker_file, LL_APR_WB);
+                outfile.open(marker_file, LL_APR_WB, LLAPRFile::global);
                 apr_file_t* fMarker = outfile.getFileHandle() ; 
                 if (!fMarker)
                 {
@@ -2599,24 +2599,24 @@ void LLAppViewer::initMarkerFile()
         std::string error_marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, ERROR_MARKER_FILE_NAME);
 
         
-        if (LLAPRFile::isExist(mMarkerFileName, NULL, LL_APR_RB) && !anotherInstanceRunning())
+        if (LLAPRFile::isExist(mMarkerFileName, LL_APR_RB) && !anotherInstanceRunning())
         {
                 gLastExecEvent = LAST_EXEC_FROZE;
                 LL_INFOS("MarkerFile") << "Exec marker found: program froze on previous execution" << LL_ENDL;
         }    
     
-        if(LLAPRFile::isExist(logout_marker_file, NULL, LL_APR_RB))
+        if(LLAPRFile::isExist(logout_marker_file, LL_APR_RB))
         {
                 LL_INFOS("MarkerFile") << "Last exec LLError crashed, setting LastExecEvent to " << LAST_EXEC_LLERROR_CRASH << LL_ENDL;
                 gLastExecEvent = LAST_EXEC_LOGOUT_FROZE;
         }
-        if(LLAPRFile::isExist(llerror_marker_file, NULL, LL_APR_RB))
+        if(LLAPRFile::isExist(llerror_marker_file, LL_APR_RB))
         {
                 llinfos << "Last exec LLError crashed, setting LastExecEvent to " << LAST_EXEC_LLERROR_CRASH << llendl;
                 if(gLastExecEvent == LAST_EXEC_LOGOUT_FROZE) gLastExecEvent = LAST_EXEC_LOGOUT_CRASH;
                 else gLastExecEvent = LAST_EXEC_LLERROR_CRASH;
         }
-        if(LLAPRFile::isExist(error_marker_file, NULL, LL_APR_RB))
+        if(LLAPRFile::isExist(error_marker_file, LL_APR_RB))
         {
                 LL_INFOS("MarkerFile") << "Last exec crashed, setting LastExecEvent to " << LAST_EXEC_OTHER_CRASH << LL_ENDL;
                 if(gLastExecEvent == LAST_EXEC_LOGOUT_FROZE) gLastExecEvent = LAST_EXEC_LOGOUT_CRASH;
@@ -2635,7 +2635,7 @@ void LLAppViewer::initMarkerFile()
         
         // Create the marker file for this execution & lock it
         apr_status_t s;
-        s = mMarkerFile.open(mMarkerFileName, LL_APR_W, gAPRPoolp);     
+        s = mMarkerFile.open(mMarkerFileName, LL_APR_W, LLAPRFile::global);
 
         if (s == APR_SUCCESS && mMarkerFile.getFileHandle())
         {
@@ -3716,7 +3716,7 @@ void LLAppViewer::sendLogoutRequest()
                 mLogoutMarkerFileName = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,LOGOUT_MARKER_FILE_NAME);
                 
                 LLAPRFile outfile ;
-                outfile.open(mLogoutMarkerFileName, LL_APR_W);
+                outfile.open(mLogoutMarkerFileName, LL_APR_W, LLAPRFile::global);
                 mLogoutMarkerFile =  outfile.getFileHandle() ;
                 if (mLogoutMarkerFile)
                 {