diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-04-19 23:46:18 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-04-19 23:46:18 +0300 |
| commit | 27301aa5461ccc8e1e16edd6438875ecd701065d (patch) | |
| tree | 67e1925f4be23cb477a980539f79fe6354350d3f | |
| parent | b8069d1c250c03e9fffda0a9264bfd04a12f8292 (diff) | |
STORM-1182 FIX Fixed XUI Preview tool not loading XML files from a dev checkout on Linux.
The bug seems to be caused by recent switch to Autobuild, which affected the build directory path.
| -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..ae25ab2f21 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.find("/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; } |