diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-05-04 10:06:34 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-05-04 10:06:34 -0400 |
| commit | 0be3b1fdd9821929fc537e1c812f26268979dbf0 (patch) | |
| tree | 2848e2c95a4006e6c9e5fcad11fe9b1ab2488db3 /indra/llvfs/lldir_mac.cpp | |
| parent | 8decd5a4e6c94e27381186e581cf199ba3ede437 (diff) | |
| parent | a23ad02cf568b680a409cf40f69cfb1b1591082c (diff) | |
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; |