diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-02-05 10:10:27 -0800 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-02-05 10:10:27 -0800 |
| commit | 3c9daac7afeeb31d2feabde59183a2e005a30d7f (patch) | |
| tree | 62c58ae3478f4763660687a59ca77491a604e1fa /indra/llvfs | |
| parent | e00082c644d201291a4f9243f915fc09c320eaa7 (diff) | |
| parent | fed6c9eb0fa58559c13729b65ecee181f58f3c69 (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; |