diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-03-02 21:25:50 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-03-02 21:25:50 +0000 |
| commit | 4dabd9c0472deb49573fdafef2fa413e59703f19 (patch) | |
| tree | 06c680d6a2047e03838d6548bccd26c7baf9d652 /indra/llvfs/llvfile.cpp | |
| parent | d4462963c6ba5db2088723bbedc7b60f1184c594 (diff) | |
merge release@58699 beta-1-14-0@58707 -> release
Diffstat (limited to 'indra/llvfs/llvfile.cpp')
| -rw-r--r-- | indra/llvfs/llvfile.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/llvfs/llvfile.cpp b/indra/llvfs/llvfile.cpp index a4612233d3..ae45c8fe42 100644 --- a/indra/llvfs/llvfile.cpp +++ b/indra/llvfs/llvfile.cpp @@ -51,12 +51,12 @@ LLVFile::~LLVFile() { if (!(mMode & LLVFile::WRITE)) { - // llwarns << "Destroying LLVFile with pending async read/write, aborting..." << llendl; - sVFSThread->abortRequest(mHandle, LLVFSThread::AUTO_COMPLETE); + //llwarns << "Destroying LLVFile with pending async read/write, aborting..." << llendl; + sVFSThread->setFlags(mHandle, LLVFSThread::FLAG_AUTO_COMPLETE | LLVFSThread::FLAG_ABORT); } else // WRITE { - sVFSThread->setFlags(mHandle, LLVFSThread::AUTO_COMPLETE); + sVFSThread->setFlags(mHandle, LLVFSThread::FLAG_AUTO_COMPLETE); } } } @@ -194,8 +194,8 @@ BOOL LLVFile::write(const U8 *buffer, S32 bytes) S32 offset = -1; mHandle = sVFSThread->write(mVFS, mFileID, mFileType, writebuf, offset, bytes, - LLVFSThread::AUTO_COMPLETE | LLVFSThread::AUTO_DELETE); - mHandle = LLVFSThread::nullHandle(); // AUTO_COMPLETE means we don't track this + LLVFSThread::FLAG_AUTO_COMPLETE | LLVFSThread::FLAG_AUTO_DELETE); + mHandle = LLVFSThread::nullHandle(); // FLAG_AUTO_COMPLETE means we don't track this } else { @@ -304,7 +304,7 @@ BOOL LLVFile::setMaxSize(S32 size) } if (sVFSThread->isPaused()) { - sVFSThread->updateQueue(0); + sVFSThread->update(0); } ms_sleep(10); } @@ -408,7 +408,7 @@ void LLVFile::waitForLock(EVFSLock lock) { if (sVFSThread->isPaused()) { - sVFSThread->updateQueue(0); + sVFSThread->update(0); } ms_sleep(1); } |