diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-08-28 23:57:41 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-08-28 23:57:41 +0000 |
| commit | 4a6bacea0f8dcff959028f285bc533852da608b5 (patch) | |
| tree | 7f49b429051e550f70917ccbcdd1c27bf86f5bdf /indra/llvfs | |
| parent | ac4766d4354ee1945f1569a94d755e3e7c0cd566 (diff) | |
merge viewer/viewer_1-21 94170-94770 -> release
merge viewer/viewer_1-21-0 94830-95157 -> release
Includes:
QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki!
QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme
Diffstat (limited to 'indra/llvfs')
| -rw-r--r-- | indra/llvfs/llvfs.cpp | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/indra/llvfs/llvfs.cpp b/indra/llvfs/llvfs.cpp index 07c6124544..ef9abd99e9 100644 --- a/indra/llvfs/llvfs.cpp +++ b/indra/llvfs/llvfs.cpp @@ -1996,26 +1996,25 @@ std::string get_extension(LLAssetType::EType type) std::string extension; switch(type) { - case LLAssetType::AT_TEXTURE: - extension = ".j2c"; + case LLAssetType::AT_TEXTURE: + extension = ".jp2"; // formerly ".j2c" break; - case LLAssetType::AT_SOUND: + case LLAssetType::AT_SOUND: extension = ".ogg"; break; - case LLAssetType::AT_SOUND_WAV: + case LLAssetType::AT_SOUND_WAV: extension = ".wav"; break; - case LLAssetType::AT_TEXTURE_TGA: + case LLAssetType::AT_TEXTURE_TGA: extension = ".tga"; break; - case LLAssetType::AT_IMAGE_JPEG: - extension = ".jpeg"; - break; - case LLAssetType::AT_ANIMATION: + case LLAssetType::AT_ANIMATION: extension = ".lla"; break; - default: - extension = ".data"; + default: + // Just use the asset server filename extension in most cases + extension += "."; + extension += LLAssetType::lookup(type); break; } return extension; @@ -2050,6 +2049,7 @@ void LLVFS::dumpFiles() { lockData(); + S32 files_extracted = 0; for (fileblock_map::iterator it = mFileBlocks.begin(); it != mFileBlocks.end(); ++it) { LLVFSFileSpecifier file_spec = it->first; @@ -2073,10 +2073,13 @@ void LLVFS::dumpFiles() ll_apr_file_write(file, buffer, size); apr_file_close(file); delete[] buffer; + files_extracted++; } } unlockData(); + + llinfos << "Extracted " << files_extracted << " files out of " << mFileBlocks.size() << llendl; } //============================================================================ |