diff options
| author | Aleric Inglewood | 2010-10-24 00:16:45 +0200 |
|---|---|---|
| committer | Aleric Inglewood | 2010-10-24 00:16:45 +0200 |
| commit | df41e471c1e7eca1dd50ad7e752f41c391c518c2 (patch) | |
| tree | 945b797af6fa9e96a914f315b09c97ce49caadec /linden/indra/llvfs | |
| parent | Merge branch 'weekly' into webkit_plugins (diff) | |
| parent | IMP-664: WARNING: addFeature: LLFeatureList::Attempting to add preexisting fe... (diff) | |
| download | meta-impy-df41e471c1e7eca1dd50ad7e752f41c391c518c2.zip meta-impy-df41e471c1e7eca1dd50ad7e752f41c391c518c2.tar.gz meta-impy-df41e471c1e7eca1dd50ad7e752f41c391c518c2.tar.bz2 meta-impy-df41e471c1e7eca1dd50ad7e752f41c391c518c2.tar.xz | |
Merge branch 'weekly' into webkit_plugins
Conflicts:
linden/doc/contributions.txt
Renamed RED --> IMP. Merged entries from both.
Diffstat (limited to 'linden/indra/llvfs')
| -rw-r--r-- | linden/indra/llvfs/llvfs.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/llvfs/llvfs.cpp b/linden/indra/llvfs/llvfs.cpp index 7df2a81..9bf5b59 100644 --- a/linden/indra/llvfs/llvfs.cpp +++ b/linden/indra/llvfs/llvfs.cpp | |||
| @@ -583,8 +583,9 @@ LLVFS::LLVFS(const std::string& index_filename, const std::string& data_filename | |||
| 583 | } | 583 | } |
| 584 | } | 584 | } |
| 585 | 585 | ||
| 586 | LL_WARNS("VFS") << "Using index file " << mIndexFilename << LL_ENDL; | 586 | // Success! |
| 587 | LL_WARNS("VFS") << "Using data file " << mDataFilename << LL_ENDL; | 587 | LL_INFOS("VFS") << "Using index file " << mIndexFilename << LL_ENDL; |
| 588 | LL_INFOS("VFS") << "Using data file " << mDataFilename << LL_ENDL; | ||
| 588 | 589 | ||
| 589 | mValid = VFSVALID_OK; | 590 | mValid = VFSVALID_OK; |
| 590 | } | 591 | } |