diff options
author | Oz Linden <oz@lindenlab.com> | 2011-05-04 09:36:39 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-05-04 09:36:39 -0400 |
commit | 3b79c9c81dc1ba4cb92f1ac54bd74a57e6d5aa05 (patch) | |
tree | cf27e69ff2bea8c621d1073172636146b8c73a57 /indra/llvfs | |
parent | c3df5f5d675abd107e1f0b4e3fb262226978ddb5 (diff) | |
parent | b9bb792c478d703c6442351ecb563c0a67f77111 (diff) |
merge changes for viewer-development before mesh merge
Diffstat (limited to 'indra/llvfs')
-rw-r--r-- | indra/llvfs/lldir_linux.cpp | 6 | ||||
-rw-r--r-- | indra/llvfs/lldir_mac.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/indra/llvfs/lldir_linux.cpp b/indra/llvfs/lldir_linux.cpp index 73f2336f94..72b54f5380 100644 --- a/indra/llvfs/lldir_linux.cpp +++ b/indra/llvfs/lldir_linux.cpp @@ -93,11 +93,11 @@ LLDir_Linux::LLDir_Linux() #else mAppRODataDir = tmp_str; #endif - std::string::size_type indra_pos = mExecutableDir.find("/indra"); - if (indra_pos != std::string::npos) + std::string::size_type build_dir_pos = mExecutableDir.rfind("/build-linux-"); + if (build_dir_pos != std::string::npos) { // ...we're in a dev checkout - mSkinBaseDir = mExecutableDir.substr(0, indra_pos) + "/indra/newview/skins"; + mSkinBaseDir = mExecutableDir.substr(0, build_dir_pos) + "/indra/newview/skins"; llinfos << "Running in dev checkout with mSkinBaseDir " << mSkinBaseDir << llendl; } diff --git a/indra/llvfs/lldir_mac.cpp b/indra/llvfs/lldir_mac.cpp index 445285aa43..f9369b043e 100644 --- a/indra/llvfs/lldir_mac.cpp +++ b/indra/llvfs/lldir_mac.cpp @@ -150,11 +150,11 @@ LLDir_Mac::LLDir_Mac() CFURLRef resourcesURLRef = CFBundleCopyResourcesDirectoryURL(mainBundleRef); CFURLRefToLLString(resourcesURLRef, mAppRODataDir, true); - U32 indra_pos = mExecutableDir.find("/indra"); - if (indra_pos != std::string::npos) + U32 build_dir_pos = mExecutableDir.rfind("/build-darwin-"); + if (build_dir_pos != std::string::npos) { // ...we're in a dev checkout - mSkinBaseDir = mExecutableDir.substr(0, indra_pos) + mSkinBaseDir = mExecutableDir.substr(0, build_dir_pos) + "/indra/newview/skins"; llinfos << "Running in dev checkout with mSkinBaseDir " << mSkinBaseDir << llendl; |