diff options
Diffstat (limited to 'indra/llvfs')
23 files changed, 5 insertions, 5 deletions
diff --git a/indra/llvfs/CMakeLists.txt b/indra/llvfs/CMakeLists.txt index 05c7c7860c..05c7c7860c 100755..100644 --- a/indra/llvfs/CMakeLists.txt +++ b/indra/llvfs/CMakeLists.txt diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp index 795aa8327d..795aa8327d 100755..100644 --- a/indra/llvfs/lldir.cpp +++ b/indra/llvfs/lldir.cpp diff --git a/indra/llvfs/lldir.h b/indra/llvfs/lldir.h index 05d5efc66f..05d5efc66f 100755..100644 --- a/indra/llvfs/lldir.h +++ b/indra/llvfs/lldir.h diff --git a/indra/llvfs/lldir_linux.cpp b/indra/llvfs/lldir_linux.cpp index a9736560ec..f72195b211 100755..100644 --- a/indra/llvfs/lldir_linux.cpp +++ b/indra/llvfs/lldir_linux.cpp @@ -99,7 +99,7 @@ LLDir_Linux::LLDir_Linux() #else mAppRODataDir = tmp_str; #endif - U32 indra_pos = mExecutableDir.find("/indra"); + std::string::size_type indra_pos = mExecutableDir.find("/indra"); if (indra_pos != std::string::npos) { // ...we're in a dev checkout diff --git a/indra/llvfs/lldir_linux.h b/indra/llvfs/lldir_linux.h index 1fec15c5c6..1fec15c5c6 100755..100644 --- a/indra/llvfs/lldir_linux.h +++ b/indra/llvfs/lldir_linux.h diff --git a/indra/llvfs/lldir_mac.cpp b/indra/llvfs/lldir_mac.cpp index 8d3852002c..8d3852002c 100755..100644 --- a/indra/llvfs/lldir_mac.cpp +++ b/indra/llvfs/lldir_mac.cpp diff --git a/indra/llvfs/lldir_mac.h b/indra/llvfs/lldir_mac.h index 834acc7262..834acc7262 100755..100644 --- a/indra/llvfs/lldir_mac.h +++ b/indra/llvfs/lldir_mac.h diff --git a/indra/llvfs/lldir_solaris.cpp b/indra/llvfs/lldir_solaris.cpp index 8ac5a41e93..8ac5a41e93 100755..100644 --- a/indra/llvfs/lldir_solaris.cpp +++ b/indra/llvfs/lldir_solaris.cpp diff --git a/indra/llvfs/lldir_solaris.h b/indra/llvfs/lldir_solaris.h index 1fa8348355..1fa8348355 100755..100644 --- a/indra/llvfs/lldir_solaris.h +++ b/indra/llvfs/lldir_solaris.h diff --git a/indra/llvfs/lldir_win32.cpp b/indra/llvfs/lldir_win32.cpp index 4eb10c842b..cca216e8b0 100755..100644 --- a/indra/llvfs/lldir_win32.cpp +++ b/indra/llvfs/lldir_win32.cpp @@ -122,10 +122,6 @@ LLDir_Win32::LLDir_Win32() mExecutableDir = utf16str_to_utf8str(llutf16string(w_str)); #endif - mAppRODataDir = "."; - - mSkinBaseDir = mAppRODataDir + mDirDelimiter + "skins"; - if (mExecutableDir.find("indra") == std::string::npos) { // Running from installed directory. Make sure current @@ -135,8 +131,12 @@ LLDir_Win32::LLDir_Win32() GetCurrentDirectory(MAX_PATH, w_str); mWorkingDir = utf16str_to_utf8str(llutf16string(w_str)); } + mAppRODataDir = mWorkingDir; + llinfos << "mAppRODataDir = " << mAppRODataDir << llendl; + mSkinBaseDir = mAppRODataDir + mDirDelimiter + "skins"; + // Build the default cache directory mDefaultCacheDir = buildSLOSCacheDir(); diff --git a/indra/llvfs/lldir_win32.h b/indra/llvfs/lldir_win32.h index c2acfa6bd4..c2acfa6bd4 100755..100644 --- a/indra/llvfs/lldir_win32.h +++ b/indra/llvfs/lldir_win32.h diff --git a/indra/llvfs/lldirguard.h b/indra/llvfs/lldirguard.h index 85366120d8..85366120d8 100755..100644 --- a/indra/llvfs/lldirguard.h +++ b/indra/llvfs/lldirguard.h diff --git a/indra/llvfs/lllfsthread.cpp b/indra/llvfs/lllfsthread.cpp index 49c198a82d..49c198a82d 100755..100644 --- a/indra/llvfs/lllfsthread.cpp +++ b/indra/llvfs/lllfsthread.cpp diff --git a/indra/llvfs/lllfsthread.h b/indra/llvfs/lllfsthread.h index 3139693302..3139693302 100755..100644 --- a/indra/llvfs/lllfsthread.h +++ b/indra/llvfs/lllfsthread.h diff --git a/indra/llvfs/llpidlock.cpp b/indra/llvfs/llpidlock.cpp index 28cee29405..28cee29405 100755..100644 --- a/indra/llvfs/llpidlock.cpp +++ b/indra/llvfs/llpidlock.cpp diff --git a/indra/llvfs/llpidlock.h b/indra/llvfs/llpidlock.h index 496e99cf5a..496e99cf5a 100755..100644 --- a/indra/llvfs/llpidlock.h +++ b/indra/llvfs/llpidlock.h diff --git a/indra/llvfs/llvfile.cpp b/indra/llvfs/llvfile.cpp index 6751f3eb93..6751f3eb93 100755..100644 --- a/indra/llvfs/llvfile.cpp +++ b/indra/llvfs/llvfile.cpp diff --git a/indra/llvfs/llvfile.h b/indra/llvfs/llvfile.h index c3bca8c737..c3bca8c737 100755..100644 --- a/indra/llvfs/llvfile.h +++ b/indra/llvfs/llvfile.h diff --git a/indra/llvfs/llvfs.cpp b/indra/llvfs/llvfs.cpp index ddb76fb2ba..ddb76fb2ba 100755..100644 --- a/indra/llvfs/llvfs.cpp +++ b/indra/llvfs/llvfs.cpp diff --git a/indra/llvfs/llvfs.h b/indra/llvfs/llvfs.h index 2acda7ae29..2acda7ae29 100755..100644 --- a/indra/llvfs/llvfs.h +++ b/indra/llvfs/llvfs.h diff --git a/indra/llvfs/llvfsthread.cpp b/indra/llvfs/llvfsthread.cpp index 69da4b75e5..69da4b75e5 100755..100644 --- a/indra/llvfs/llvfsthread.cpp +++ b/indra/llvfs/llvfsthread.cpp diff --git a/indra/llvfs/llvfsthread.h b/indra/llvfs/llvfsthread.h index 0a9786e9e1..0a9786e9e1 100755..100644 --- a/indra/llvfs/llvfsthread.h +++ b/indra/llvfs/llvfsthread.h diff --git a/indra/llvfs/tests/lldir_test.cpp b/indra/llvfs/tests/lldir_test.cpp index 9befa59477..9befa59477 100755..100644 --- a/indra/llvfs/tests/lldir_test.cpp +++ b/indra/llvfs/tests/lldir_test.cpp |