summaryrefslogtreecommitdiff
path: root/indra/llvfs/llvfile.cpp
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-06-09 14:06:04 -0400
committerDebi King (Dessie) <dessie@lindenlab.com>2011-06-09 14:06:04 -0400
commit3c539c498a328696c9aa3cd8f00519d9ad0a40e8 (patch)
tree49ec2d995791cf43842fbe0764f5e5fe124a95d8 /indra/llvfs/llvfile.cpp
parentffe8417a0410a554e22210c83feadeea76d0ab8a (diff)
parentd5041f5fb0850f71474f0b6a37e15ef322c509a7 (diff)
reconciled .hgtags
Diffstat (limited to 'indra/llvfs/llvfile.cpp')
-rw-r--r--indra/llvfs/llvfile.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llvfs/llvfile.cpp b/indra/llvfs/llvfile.cpp
index a8db7b235e..ca749c5eaf 100644
--- a/indra/llvfs/llvfile.cpp
+++ b/indra/llvfs/llvfile.cpp
@@ -314,7 +314,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)
{
@@ -422,7 +422,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))
{