diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-04 09:38:29 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-04 09:38:29 -0400 |
| commit | 383fccbd57ef273aa803497ad87cf9badc5db90a (patch) | |
| tree | ab042292d129a92092b35accde69eb57a3565389 /indra/llvfs/lldir_linux.cpp | |
| parent | f5bb046c5d3d393352b5b90424837a3d213dfbb9 (diff) | |
| parent | b9bb792c478d703c6442351ecb563c0a67f77111 (diff) | |
merge changes for viewer-development before mesh merge
Diffstat (limited to 'indra/llvfs/lldir_linux.cpp')
| -rw-r--r-- | indra/llvfs/lldir_linux.cpp | 6 |
1 files changed, 3 insertions, 3 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; } |