summaryrefslogtreecommitdiff
path: root/indra/llvfs/lldir_linux.cpp
diff options
context:
space:
mode:
authorLogan Dethrow <log@lindenlab.com>2011-05-06 15:25:12 -0400
committerLogan Dethrow <log@lindenlab.com>2011-05-06 15:25:12 -0400
commit39ad3f1d880a26dcf8189cad2501002c189a7ac2 (patch)
treea843d0c5843ca5e6a5fcbdfc6929bc2b21b960d6 /indra/llvfs/lldir_linux.cpp
parent5c7a906b44aa950ec3c8b786fec6516b51f9d66c (diff)
parentdef9f9290e661e6a35b7b255eb71b6e2767fdea0 (diff)
merge
Diffstat (limited to 'indra/llvfs/lldir_linux.cpp')
-rw-r--r--indra/llvfs/lldir_linux.cpp6
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;
}