summaryrefslogtreecommitdiff
path: root/indra/llvfs/llvfile.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-16 10:28:35 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-16 10:28:35 +0000
commitaa7fadfde02d396ab04c82f91f01d486b4f5396d (patch)
tree21e0e919da0ad23f3a39b5128ba5313f0f8a78d5 /indra/llvfs/llvfile.cpp
parente3367fad368660bf40db29a82237475a9f2dfdbd (diff)
parent9c5e4d315a4b5f5a0793587c6a6620f6efc76332 (diff)
merge from viewer2.
Diffstat (limited to 'indra/llvfs/llvfile.cpp')
-rw-r--r--indra/llvfs/llvfile.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llvfs/llvfile.cpp b/indra/llvfs/llvfile.cpp
index 5fdf41188d..e0e282d7af 100644
--- a/indra/llvfs/llvfile.cpp
+++ b/indra/llvfs/llvfile.cpp
@@ -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))
{