5 files changed, 68 insertions, 2 deletions
diff --git a/indra/llvfs/CMakeLists.txt b/indra/llvfs/CMakeLists.txt
new file mode 100644
index 0000000000..9f136f7772
--- /dev/null
+++ b/indra/llvfs/CMakeLists.txt
@@ -0,0 +1,58 @@
+# -*- cmake -*-
+
+project(llvfs)
+
+include(00-Common)
+include(LLCommon)
+include(UnixInstall)
+
+include_directories(
+    ${LLCOMMON_INCLUDE_DIRS}
+    )
+
+set(llvfs_SOURCE_FILES
+    lldir.cpp
+    lllfsthread.cpp
+    llvfile.cpp
+    llvfs.cpp
+    llvfsthread.cpp
+    )
+
+set(llvfs_HEADER_FILES
+    CMakeLists.txt
+
+    lldir.h
+    lllfsthread.h
+    llvfile.h
+    llvfs.h
+    llvfsthread.h
+    )
+
+if (DARWIN)
+  LIST(APPEND llvfs_SOURCE_FILES lldir_mac.cpp)
+  LIST(APPEND llvfs_HEADER_FILES lldir_mac.h)
+endif (DARWIN)
+
+if (LINUX)
+  LIST(APPEND llvfs_SOURCE_FILES lldir_linux.cpp)
+  LIST(APPEND llvfs_HEADER_FILES lldir_linux.h)
+
+  if (VIEWER AND INSTALL)
+    set_source_files_properties(lldir_linux.cpp
+                                PROPERTIES COMPILE_FLAGS
+                                "-DAPP_RO_DATA_DIR=\\\"${APP_SHARE_DIR}\\\""
+                                )
+  endif (VIEWER AND INSTALL)
+endif (LINUX)
+
+if (WINDOWS)
+  LIST(APPEND llvfs_SOURCE_FILES lldir_win32.cpp)
+  LIST(APPEND llvfs_HEADER_FILES lldir_win32.h)
+endif (WINDOWS)
+
+set_source_files_properties(${llvfs_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND llvfs_SOURCE_FILES ${llvfs_HEADER_FILES})
+
+add_library (llvfs ${llvfs_SOURCE_FILES})
diff --git a/indra/llvfs/lldir_linux.cpp b/indra/llvfs/lldir_linux.cpp
index 8f9f577804..222c97156e 100644
--- a/indra/llvfs/lldir_linux.cpp
+++ b/indra/llvfs/lldir_linux.cpp
@@ -93,7 +93,11 @@ LLDir_Linux::LLDir_Linux()
 	mExecutablePathAndName = "";
 	mExecutableDir = tmp_str;
 	mWorkingDir = tmp_str;
+#ifdef APP_RO_DATA_DIR
+	mAppRODataDir = APP_RO_DATA_DIR;
+#else
 	mAppRODataDir = tmp_str;
+#endif
 	mOSUserDir = getCurrentUserHome(tmp_str);
 	mOSUserAppDir = "";
 	mLindenUserDir = tmp_str;
diff --git a/indra/llvfs/lldir_win32.cpp b/indra/llvfs/lldir_win32.cpp
index f415fe56ed..17723b36d1 100644
--- a/indra/llvfs/lldir_win32.cpp
+++ b/indra/llvfs/lldir_win32.cpp
@@ -116,10 +116,16 @@ LLDir_Win32::LLDir_Win32()
 	GetCurrentDirectory(MAX_PATH, w_str);
 	mExecutableDir = utf16str_to_utf8str(llutf16string(w_str));
 #endif
+	
+	mAppRODataDir = getCurPath();
+	// *FIX:Mani - The following is the old way we did things. I'm keeping this around
+	// in case there is some really good reason to make mAppRODataDir == mExecutableDir
+	/*
 	if (strstr(mExecutableDir.c_str(), "indra\\newview"))
 		mAppRODataDir = getCurPath();
 	else
 		mAppRODataDir = mExecutableDir;
+	*/
 }
 
 LLDir_Win32::~LLDir_Win32()
diff --git a/indra/llvfs/lllfsthread.cpp b/indra/llvfs/lllfsthread.cpp
index 8d2dc72ffc..76e25e2272 100644
--- a/indra/llvfs/lllfsthread.cpp
+++ b/indra/llvfs/lllfsthread.cpp
@@ -30,7 +30,6 @@
  */
 
 #include "linden_common.h"
-#include "llmath.h"
 #include "lllfsthread.h"
 #include "llstl.h"
 #include "llapr.h"
diff --git a/indra/llvfs/llvfsthread.cpp b/indra/llvfs/llvfsthread.cpp
index fbfbdffaf3..c9bc544d72 100644
--- a/indra/llvfs/llvfsthread.cpp
+++ b/indra/llvfs/llvfsthread.cpp
@@ -30,7 +30,6 @@
  */
 
 #include "linden_common.h"
-#include "llmath.h"
 #include "llvfsthread.h"
 #include "llstl.h"