diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-02-05 16:47:38 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-02-05 16:47:38 -0800 |
| commit | 91b2ff00ae874f938919373c0db3de0721c7bf25 (patch) | |
| tree | e0c4c8e11cd4a158c1f7d53fea7434eee3781d97 /indra/llvfs | |
| parent | 617a7a0ebdd47aeea578456f4ed0d91ab8582a0b (diff) | |
| parent | 68ea862c96a96be631505e88ae870d6aab066eb9 (diff) | |
Merge
Diffstat (limited to 'indra/llvfs')
| -rwxr-xr-x | indra/llvfs/llpidlock.cpp | 8 | ||||
| -rw-r--r-- | indra/llvfs/llvfile.h | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/indra/llvfs/llpidlock.cpp b/indra/llvfs/llpidlock.cpp index 95e3692e10..28cee29405 100755 --- a/indra/llvfs/llpidlock.cpp +++ b/indra/llvfs/llpidlock.cpp @@ -68,8 +68,12 @@ class LLPidLockFile { public: LLPidLockFile( ) : - mSaving(FALSE), mWaiting(FALSE), - mClean(TRUE), mPID(getpid()) + mAutosave(false), + mSaving(false), + mWaiting(false), + mPID(getpid()), + mNameTable(NULL), + mClean(true) { mLockName = gDirUtilp->getTempDir() + gDirUtilp->getDirDelimiter() + "savelock"; } diff --git a/indra/llvfs/llvfile.h b/indra/llvfs/llvfile.h index 5f69a41040..c3bca8c737 100644 --- a/indra/llvfs/llvfile.h +++ b/indra/llvfs/llvfile.h @@ -88,7 +88,6 @@ protected: S32 mMode; LLVFS *mVFS; F32 mPriority; - BOOL mOnReadQueue; S32 mBytesRead; LLVFSThread::handle_t mHandle; |