diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-04-07 13:50:47 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-04-07 13:50:47 -0500 |
| commit | 666c7c429b7f38f7c93bf6c287157c2e3ab9ccd7 (patch) | |
| tree | 8f3e9399dbc5cab6c28c5992b579368bb0aa8949 /indra/llvfs/llvfile.cpp | |
| parent | 8ac6310020bd2d524c97c729c29a0afe4a529ecf (diff) | |
| parent | b6d3d2281b855448bbeec33b2d229222d75cd6b1 (diff) | |
merge
Diffstat (limited to 'indra/llvfs/llvfile.cpp')
| -rw-r--r-- | indra/llvfs/llvfile.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llvfs/llvfile.cpp b/indra/llvfs/llvfile.cpp index 5fdf41188d..6751f3eb93 100644 --- a/indra/llvfs/llvfile.cpp +++ b/indra/llvfs/llvfile.cpp @@ -320,7 +320,7 @@ BOOL LLVFile::setMaxSize(S32 size) if (!mVFS->checkAvailable(size)) { - LLFastTimer t(FTM_VFILE_WAIT); + //LLFastTimer t(FTM_VFILE_WAIT); S32 count = 0; while (sVFSThread->getPending() > 1000) { @@ -428,7 +428,7 @@ bool LLVFile::isLocked(EVFSLock lock) void LLVFile::waitForLock(EVFSLock lock) { - LLFastTimer t(FTM_VFILE_WAIT); + //LLFastTimer t(FTM_VFILE_WAIT); // spin until the lock clears while (isLocked(lock)) { |