summaryrefslogtreecommitdiff
path: root/indra/llvfs
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2008-03-20 21:41:26 +0000
committerSteven Bennetts <steve@lindenlab.com>2008-03-20 21:41:26 +0000
commite3b97ac65b10a58c1dac041743e4acd1042492f5 (patch)
tree1648189fd15e51ac1c2eb8d8018faa775c93f6d3 /indra/llvfs
parentb502c86f30d3ed01b795548364ab8090363eeac5 (diff)
merge release@82383 viewer-cleanup2-7-merge@82828
QAR-369
Diffstat (limited to 'indra/llvfs')
-rw-r--r--indra/llvfs/llvfile.cpp1
-rw-r--r--indra/llvfs/llvfile.h2
2 files changed, 0 insertions, 3 deletions
diff --git a/indra/llvfs/llvfile.cpp b/indra/llvfs/llvfile.cpp
index b25ec4a86e..bd4dfc2d78 100644
--- a/indra/llvfs/llvfile.cpp
+++ b/indra/llvfs/llvfile.cpp
@@ -45,7 +45,6 @@ const S32 LLVFile::APPEND = 0x00000006; // 0x00000004 & LLVFile::WRITE
//----------------------------------------------------------------------------
LLVFSThread* LLVFile::sVFSThread = NULL;
BOOL LLVFile::sAllocdVFSThread = FALSE;
-BOOL LLVFile::ALLOW_ASYNC = TRUE;
//----------------------------------------------------------------------------
//============================================================================
diff --git a/indra/llvfs/llvfile.h b/indra/llvfs/llvfile.h
index 3d81483308..cd4fc59174 100644
--- a/indra/llvfs/llvfile.h
+++ b/indra/llvfs/llvfile.h
@@ -78,8 +78,6 @@ public:
static const S32 WRITE;
static const S32 READ_WRITE;
static const S32 APPEND;
-
- static BOOL ALLOW_ASYNC;
protected:
LLAssetType::EType mFileType;