diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-05-04 11:17:19 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-05-04 11:17:19 -0700 |
| commit | 90cad613b029f71a131303d6efaadd22aba21626 (patch) | |
| tree | 2d2c48fa6f69a478b51ded1b8da578e2a43c5cfe /indra/llvfs/lldir_mac.cpp | |
| parent | f3bb2e31dc6a1e8e02854a70db4ecd4cf586d4ba (diff) | |
| parent | 3f9253e783826bbe27a995786be8305f8ecb2d6d (diff) | |
hg merge
Diffstat (limited to 'indra/llvfs/lldir_mac.cpp')
| -rw-r--r-- | indra/llvfs/lldir_mac.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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; |