diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-02 07:27:28 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-02 07:27:28 -0400 |
| commit | 5b3b0a6f2aa1c5fd44cadf8cebf5dea6b04fb1ab (patch) | |
| tree | b6c1847f77ae04dcb5ffacc801e039cc4b331fa4 | |
| parent | 2ace3d7ce487072be2a85e4645fd996b920ffb5a (diff) | |
| parent | c18e2f74b0f98bc772cb4cdcda17e598971b8b62 (diff) | |
merge changes for storm-1182
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/llvfs/lldir_linux.cpp | 6 | ||||
| -rw-r--r-- | indra/llvfs/lldir_mac.cpp | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index c1f2074083..fc3bce2763 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -204,6 +204,7 @@ Boroondas Gupte SNOW-624 SNOW-737 STORM-318 + STORM-1182 VWR-233 VWR-20583 VWR-20891 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; |