diff options
| author | David Parks <davep@lindenlab.com> | 2009-11-02 19:55:37 +0000 |
|---|---|---|
| committer | David Parks <davep@lindenlab.com> | 2009-11-02 19:55:37 +0000 |
| commit | 3e80fa3dbc943de9b784fedc202ba38cf238f46d (patch) | |
| tree | deeaedd0bf4ed9eb9f99ec47325198efce512e5f /indra/llvfs | |
| parent | 9a196cdda8fa62b90f6f390b21986712d198f03e (diff) | |
Sync up with render-pipeline-7 ignore-dead-branch
Diffstat (limited to 'indra/llvfs')
| -rw-r--r-- | indra/llvfs/llvfile.cpp | 2 | ||||
| -rw-r--r-- | indra/llvfs/llvfs.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/indra/llvfs/llvfile.cpp b/indra/llvfs/llvfile.cpp index 5fdf41188d..e0e282d7af 100644 --- a/indra/llvfs/llvfile.cpp +++ b/indra/llvfs/llvfile.cpp @@ -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 += "."; |