diff options
author | McCabe Maxsted | 2010-11-23 17:37:52 -0700 |
---|---|---|
committer | McCabe Maxsted | 2010-11-23 17:37:52 -0700 |
commit | 04ef9fcd012de46b9e142a20d085bf6260fe52c8 (patch) | |
tree | dbde7eed4c1140e803f50d9519464be6288e782a /linden/indra/llvfs | |
parent | Merge remote branch 'thickbrick/weekly' into weekly (diff) | |
parent | IMP-701: An API to wrap objects for thread-safe access. (diff) | |
download | meta-impy-04ef9fcd012de46b9e142a20d085bf6260fe52c8.zip meta-impy-04ef9fcd012de46b9e142a20d085bf6260fe52c8.tar.gz meta-impy-04ef9fcd012de46b9e142a20d085bf6260fe52c8.tar.bz2 meta-impy-04ef9fcd012de46b9e142a20d085bf6260fe52c8.tar.xz |
Merge remote branch 'aleric/weekly' into weekly
Diffstat (limited to 'linden/indra/llvfs')
-rw-r--r-- | linden/indra/llvfs/llvfs.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/llvfs/llvfs.cpp b/linden/indra/llvfs/llvfs.cpp index dea8c9c..654dfa1 100644 --- a/linden/indra/llvfs/llvfs.cpp +++ b/linden/indra/llvfs/llvfs.cpp | |||
@@ -237,7 +237,7 @@ const S32 LLVFSFileBlock::SERIAL_SIZE = 34; | |||
237 | LLVFS::LLVFS(const std::string& index_filename, const std::string& data_filename, const BOOL read_only, const U32 presize, const BOOL remove_after_crash) | 237 | LLVFS::LLVFS(const std::string& index_filename, const std::string& data_filename, const BOOL read_only, const U32 presize, const BOOL remove_after_crash) |
238 | : mRemoveAfterCrash(remove_after_crash) | 238 | : mRemoveAfterCrash(remove_after_crash) |
239 | { | 239 | { |
240 | mDataMutex = new LLMutex(0); | 240 | mDataMutex = new LLMutex; |
241 | 241 | ||
242 | S32 i; | 242 | S32 i; |
243 | for (i = 0; i < VFSLOCK_COUNT; i++) | 243 | for (i = 0; i < VFSLOCK_COUNT; i++) |