Put in some changes along sg1.4 dev history.

This commit is contained in:
Siana Gearz
2010-11-21 04:28:31 +01:00
parent 6866a36a5c
commit d68736da39
182 changed files with 2418 additions and 1151 deletions

View File

@@ -39,6 +39,7 @@
#include "llsdserialize.h"
#include "llnametable.h"
#include "llframetimer.h"
#include "llapp.h"
#if LL_WINDOWS //For windows platform.
bool isProcessAlive(U32 pid)
@@ -60,7 +61,7 @@ class LLPidLockFile
public:
LLPidLockFile( ) :
mSaving(FALSE), mWaiting(FALSE),
mClean(TRUE), mPID(getpid())
mClean(TRUE), mPID(LLApp::getPid())
{
mLockName = gDirUtilp->getTempDir() + "/savelock";
}