livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-2665 FIX Crashes not being reported in some cases 

made marker file lock use append, not truncate
master
Richard Linden 2013-05-09 10:54:32 -07:00
parent 0e93223aeb
commit d8f00dd1d1
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcommon/llapr.h
View File

@ -182,8 +182,10 @@ typedef LLAtomic32<S32> LLAtomicS32;
// abbreviated flags
#define LL_APR_R (APR_READ) // "r"
#define LL_APR_W (APR_CREATE|APR_TRUNCATE|APR_WRITE) // "w"
#define LL_APR_A (APR_CREATE|APR_WRITE|APR_APPEND) // "w"
#define LL_APR_RB (APR_READ|APR_BINARY) // "rb"
#define LL_APR_WB (APR_CREATE|APR_TRUNCATE|APR_WRITE|APR_BINARY) // "wb"
#define LL_APR_AB (APR_CREATE|APR_WRITE|APR_BINARY|APR_APPEND)
#define LL_APR_RPB (APR_READ|APR_WRITE|APR_BINARY) // "r+b"
#define LL_APR_WPB (APR_CREATE|APR_TRUNCATE|APR_READ|APR_WRITE|APR_BINARY) // "w+b"

2
indra/newview/llappviewer.cpp
View File

@ -3522,7 +3522,7 @@ bool LLAppViewer::anotherInstanceRunning()
{
// File exists, try opening with write permissions
LLAPRFile outfile ;
outfile.open(marker_file, LL_APR_WB);
outfile.open(marker_file, LL_APR_AB);
apr_file_t* fMarker = outfile.getFileHandle() ;
if (!fMarker)
{