From 3e80fa3dbc943de9b784fedc202ba38cf238f46d Mon Sep 17 00:00:00 2001 From: David Parks Date: Mon, 2 Nov 2009 19:55:37 +0000 Subject: Sync up with render-pipeline-7 ignore-dead-branch --- indra/llvfs/llvfile.cpp | 2 +- indra/llvfs/llvfs.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/llvfs') 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 += "."; -- cgit v1.2.3 From 71d11af31083ced30da7b67a2a63e624c93b44a3 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Sat, 13 Mar 2010 17:39:32 -0600 Subject: Mesh cache. Has a bug. --- indra/llvfs/llvfile.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llvfs') diff --git a/indra/llvfs/llvfile.cpp b/indra/llvfs/llvfile.cpp index e0e282d7af..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) { -- cgit v1.2.3 From f9b13d8f8510b1f7f02fcf92685471461b79858e Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Thu, 10 Jun 2010 00:45:48 -0500 Subject: Add "LL_MESH_ENABLED" preprocessor flag for toggling mesh code. Couple of merge fixes. --- indra/llvfs/llvfs.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/llvfs') diff --git a/indra/llvfs/llvfs.cpp b/indra/llvfs/llvfs.cpp index ddb76fb2ba..2b01288fd7 100644 --- a/indra/llvfs/llvfs.cpp +++ b/indra/llvfs/llvfs.cpp @@ -2041,9 +2041,11 @@ std::string get_extension(LLAssetType::EType type) case LLAssetType::AT_ANIMATION: extension = ".lla"; break; +#if LL_MESH_ENABLED case LLAssetType::AT_MESH: extension = ".slm"; break; +#endif default: // Just use the asset server filename extension in most cases extension += "."; -- cgit v1.2.3 From 90e3d83a5cb35e98a02a3017dd79ebc272bbfe85 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Tue, 21 Sep 2010 13:26:52 -0400 Subject: Fix for build failures - disabling tcmalloc for now --- indra/llvfs/CMakeLists.txt | 0 indra/llvfs/lldir.cpp | 0 indra/llvfs/lldir.h | 0 indra/llvfs/lldir_linux.cpp | 0 indra/llvfs/lldir_linux.h | 0 indra/llvfs/lldir_mac.cpp | 0 indra/llvfs/lldir_mac.h | 0 indra/llvfs/lldir_solaris.cpp | 0 indra/llvfs/lldir_solaris.h | 0 indra/llvfs/lldir_win32.cpp | 0 indra/llvfs/lldir_win32.h | 0 indra/llvfs/lldirguard.h | 0 indra/llvfs/lllfsthread.cpp | 0 indra/llvfs/lllfsthread.h | 0 indra/llvfs/llpidlock.cpp | 0 indra/llvfs/llpidlock.h | 0 indra/llvfs/llvfile.cpp | 0 indra/llvfs/llvfile.h | 0 indra/llvfs/llvfs.cpp | 0 indra/llvfs/llvfs.h | 0 indra/llvfs/llvfsthread.cpp | 0 indra/llvfs/llvfsthread.h | 0 indra/llvfs/tests/lldir_test.cpp | 0 23 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 indra/llvfs/CMakeLists.txt mode change 100644 => 100755 indra/llvfs/lldir.cpp mode change 100644 => 100755 indra/llvfs/lldir.h mode change 100644 => 100755 indra/llvfs/lldir_linux.cpp mode change 100644 => 100755 indra/llvfs/lldir_linux.h mode change 100644 => 100755 indra/llvfs/lldir_mac.cpp mode change 100644 => 100755 indra/llvfs/lldir_mac.h mode change 100644 => 100755 indra/llvfs/lldir_solaris.cpp mode change 100644 => 100755 indra/llvfs/lldir_solaris.h mode change 100644 => 100755 indra/llvfs/lldir_win32.cpp mode change 100644 => 100755 indra/llvfs/lldir_win32.h mode change 100644 => 100755 indra/llvfs/lldirguard.h mode change 100644 => 100755 indra/llvfs/lllfsthread.cpp mode change 100644 => 100755 indra/llvfs/lllfsthread.h mode change 100644 => 100755 indra/llvfs/llpidlock.cpp mode change 100644 => 100755 indra/llvfs/llpidlock.h mode change 100644 => 100755 indra/llvfs/llvfile.cpp mode change 100644 => 100755 indra/llvfs/llvfile.h mode change 100644 => 100755 indra/llvfs/llvfs.cpp mode change 100644 => 100755 indra/llvfs/llvfs.h mode change 100644 => 100755 indra/llvfs/llvfsthread.cpp mode change 100644 => 100755 indra/llvfs/llvfsthread.h mode change 100644 => 100755 indra/llvfs/tests/lldir_test.cpp (limited to 'indra/llvfs') diff --git a/indra/llvfs/CMakeLists.txt b/indra/llvfs/CMakeLists.txt old mode 100644 new mode 100755 diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp old mode 100644 new mode 100755 diff --git a/indra/llvfs/lldir.h b/indra/llvfs/lldir.h old mode 100644 new mode 100755 diff --git a/indra/llvfs/lldir_linux.cpp b/indra/llvfs/lldir_linux.cpp old mode 100644 new mode 100755 diff --git a/indra/llvfs/lldir_linux.h b/indra/llvfs/lldir_linux.h old mode 100644 new mode 100755 diff --git a/indra/llvfs/lldir_mac.cpp b/indra/llvfs/lldir_mac.cpp old mode 100644 new mode 100755 diff --git a/indra/llvfs/lldir_mac.h b/indra/llvfs/lldir_mac.h old mode 100644 new mode 100755 diff --git a/indra/llvfs/lldir_solaris.cpp b/indra/llvfs/lldir_solaris.cpp old mode 100644 new mode 100755 diff --git a/indra/llvfs/lldir_solaris.h b/indra/llvfs/lldir_solaris.h old mode 100644 new mode 100755 diff --git a/indra/llvfs/lldir_win32.cpp b/indra/llvfs/lldir_win32.cpp old mode 100644 new mode 100755 diff --git a/indra/llvfs/lldir_win32.h b/indra/llvfs/lldir_win32.h old mode 100644 new mode 100755 diff --git a/indra/llvfs/lldirguard.h b/indra/llvfs/lldirguard.h old mode 100644 new mode 100755 diff --git a/indra/llvfs/lllfsthread.cpp b/indra/llvfs/lllfsthread.cpp old mode 100644 new mode 100755 diff --git a/indra/llvfs/lllfsthread.h b/indra/llvfs/lllfsthread.h old mode 100644 new mode 100755 diff --git a/indra/llvfs/llpidlock.cpp b/indra/llvfs/llpidlock.cpp old mode 100644 new mode 100755 diff --git a/indra/llvfs/llpidlock.h b/indra/llvfs/llpidlock.h old mode 100644 new mode 100755 diff --git a/indra/llvfs/llvfile.cpp b/indra/llvfs/llvfile.cpp old mode 100644 new mode 100755 diff --git a/indra/llvfs/llvfile.h b/indra/llvfs/llvfile.h old mode 100644 new mode 100755 diff --git a/indra/llvfs/llvfs.cpp b/indra/llvfs/llvfs.cpp old mode 100644 new mode 100755 diff --git a/indra/llvfs/llvfs.h b/indra/llvfs/llvfs.h old mode 100644 new mode 100755 diff --git a/indra/llvfs/llvfsthread.cpp b/indra/llvfs/llvfsthread.cpp old mode 100644 new mode 100755 diff --git a/indra/llvfs/llvfsthread.h b/indra/llvfs/llvfsthread.h old mode 100644 new mode 100755 diff --git a/indra/llvfs/tests/lldir_test.cpp b/indra/llvfs/tests/lldir_test.cpp old mode 100644 new mode 100755 -- cgit v1.2.3 From cf09d6c58a741263cddcf338c2f79836873475b1 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Wed, 22 Sep 2010 03:04:21 -0500 Subject: Remove LL_MESH_ENABLED macros (fixes drag and drop). Add mesh stitching type back into tools floater. --- indra/llvfs/llvfs.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra/llvfs') diff --git a/indra/llvfs/llvfs.cpp b/indra/llvfs/llvfs.cpp index 2b01288fd7..ddb76fb2ba 100755 --- a/indra/llvfs/llvfs.cpp +++ b/indra/llvfs/llvfs.cpp @@ -2041,11 +2041,9 @@ std::string get_extension(LLAssetType::EType type) case LLAssetType::AT_ANIMATION: extension = ".lla"; break; -#if LL_MESH_ENABLED case LLAssetType::AT_MESH: extension = ".slm"; break; -#endif default: // Just use the asset server filename extension in most cases extension += "."; -- cgit v1.2.3