From bf6182daa8b4d7cea79310547f71d7a3155e17b0 Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Fri, 29 Mar 2013 07:50:08 -0700
Subject: Update Mac and Windows breakpad builds to latest
---
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/lldiriterator.cpp | 0
indra/llvfs/lldiriterator.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/llvfs_objc.h | 0
indra/llvfs/llvfs_objc.mm | 0
indra/llvfs/llvfsthread.cpp | 0
indra/llvfs/llvfsthread.h | 0
indra/llvfs/tests/lldir_test.cpp | 0
indra/llvfs/tests/lldiriterator_test.cpp | 0
28 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/lldiriterator.cpp
mode change 100644 => 100755 indra/llvfs/lldiriterator.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/llvfs_objc.h
mode change 100644 => 100755 indra/llvfs/llvfs_objc.mm
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
mode change 100644 => 100755 indra/llvfs/tests/lldiriterator_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/lldiriterator.cpp b/indra/llvfs/lldiriterator.cpp
old mode 100644
new mode 100755
diff --git a/indra/llvfs/lldiriterator.h b/indra/llvfs/lldiriterator.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/llvfs_objc.h b/indra/llvfs/llvfs_objc.h
old mode 100644
new mode 100755
diff --git a/indra/llvfs/llvfs_objc.mm b/indra/llvfs/llvfs_objc.mm
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
diff --git a/indra/llvfs/tests/lldiriterator_test.cpp b/indra/llvfs/tests/lldiriterator_test.cpp
old mode 100644
new mode 100755
--
cgit v1.2.3
From 806d09b1143894ad66cea2c228f467e8c39a8adf Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Tue, 30 Apr 2013 19:50:05 -0700
Subject: Merge 3.5.1 into Materials
---
indra/llvfs/CMakeLists.txt | 6 ++++--
indra/llvfs/llvfile.cpp | 5 +++--
2 files changed, 7 insertions(+), 4 deletions(-)
(limited to 'indra/llvfs')
diff --git a/indra/llvfs/CMakeLists.txt b/indra/llvfs/CMakeLists.txt
index 3c68b279f7..67dce8c073 100644
--- a/indra/llvfs/CMakeLists.txt
+++ b/indra/llvfs/CMakeLists.txt
@@ -8,6 +8,7 @@ include(UnixInstall)
include_directories(
${LLCOMMON_INCLUDE_DIRS}
+ ${LLCOMMON_SYSTEM_INCLUDE_DIRS}
)
set(llvfs_SOURCE_FILES
@@ -44,12 +45,12 @@ if (LINUX)
LIST(APPEND llvfs_SOURCE_FILES lldir_linux.cpp)
LIST(APPEND llvfs_HEADER_FILES lldir_linux.h)
- if (VIEWER AND INSTALL)
+ if (INSTALL)
set_source_files_properties(lldir_linux.cpp
PROPERTIES COMPILE_FLAGS
"-DAPP_RO_DATA_DIR=\\\"${APP_SHARE_DIR}\\\""
)
- endif (VIEWER AND INSTALL)
+ endif (INSTALL)
endif (LINUX)
if (WINDOWS)
@@ -70,6 +71,7 @@ set(vfs_BOOST_LIBRARIES
)
target_link_libraries(llvfs
+ ${LLCOMMON_LIBRARIES}
${vfs_BOOST_LIBRARIES}
)
diff --git a/indra/llvfs/llvfile.cpp b/indra/llvfs/llvfile.cpp
index ca749c5eaf..306d7d8ec7 100644
--- a/indra/llvfs/llvfile.cpp
+++ b/indra/llvfs/llvfile.cpp
@@ -32,6 +32,7 @@
#include "llthread.h"
#include "llstat.h"
#include "llvfs.h"
+#include "llmemory.h"
const S32 LLVFile::READ = 0x00000001;
const S32 LLVFile::WRITE = 0x00000002;
@@ -135,12 +136,12 @@ U8* LLVFile::readFile(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type, S
}
else
{
- data = new U8[file_size];
+ data = (U8*) ll_aligned_malloc_16(file_size);
file.read(data, file_size); /* Flawfinder: ignore */
if (file.getLastBytesRead() != (S32)file_size)
{
- delete[] data;
+ ll_aligned_free(data);
data = NULL;
file_size = 0;
}
--
cgit v1.2.3
From c19200eb000c958bd03645ed616bbd3a1db76735 Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Thu, 30 May 2013 17:01:28 -0700
Subject: BUG-2707 add some logging to help narrow down what part of login
instance handling is going awry
---
indra/llvfs/lldir_win32.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/llvfs')
diff --git a/indra/llvfs/lldir_win32.cpp b/indra/llvfs/lldir_win32.cpp
index 462d1cce06..6184095957 100755
--- a/indra/llvfs/lldir_win32.cpp
+++ b/indra/llvfs/lldir_win32.cpp
@@ -131,7 +131,7 @@ LLDir_Win32::LLDir_Win32()
mAppRODataDir = mExecutableDir;
}
- llinfos << "mAppRODataDir = " << mAppRODataDir << llendl;
+// llinfos << "mAppRODataDir = " << mAppRODataDir << llendl;
mSkinBaseDir = mAppRODataDir + mDirDelimiter + "skins";
--
cgit v1.2.3