diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-03-20 16:59:41 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-03-20 16:59:41 -0500 |
| commit | 8424ceb20f7baa6d5cf980d2b9ae92121d1dcb20 (patch) | |
| tree | eb691b2e04d91d0f994f1fc04acd066e4d474384 /indra/llvfs | |
| parent | 433996c2014d2f5ff5037d1fbb8bb5edbe818e1f (diff) | |
| parent | 06e3d288e40e46204d84aed9c548a6ca529e78d8 (diff) | |
merge
Diffstat (limited to 'indra/llvfs')
| -rw-r--r-- | indra/llvfs/llvfile.cpp | 4 | ||||
| -rw-r--r-- | indra/llvfs/llvfs.cpp | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/indra/llvfs/llvfile.cpp b/indra/llvfs/llvfile.cpp index 5fdf41188d..6751f3eb93 100644 --- a/indra/llvfs/llvfile.cpp +++ b/indra/llvfs/llvfile.cpp @@ -320,7 +320,7 @@ BOOL LLVFile::setMaxSize(S32 size) if (!mVFS->checkAvailable(size)) { - LLFastTimer t(FTM_VFILE_WAIT); + //LLFastTimer t(FTM_VFILE_WAIT); S32 count = 0; while (sVFSThread->getPending() > 1000) { @@ -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)) { diff --git a/indra/llvfs/llvfs.cpp b/indra/llvfs/llvfs.cpp index 9ce1e75d06..ddb76fb2ba 100644 --- a/indra/llvfs/llvfs.cpp +++ b/indra/llvfs/llvfs.cpp @@ -2041,6 +2041,9 @@ std::string get_extension(LLAssetType::EType type) case LLAssetType::AT_ANIMATION: extension = ".lla"; break; + case LLAssetType::AT_MESH: + extension = ".slm"; + break; default: // Just use the asset server filename extension in most cases extension += "."; |