Skip to content
Snippets Groups Projects
Commit 27301aa5 authored by Vadim ProductEngine's avatar Vadim ProductEngine
Browse files

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.
parent b8069d1c
No related branches found
No related tags found
No related merge requests found
...@@ -93,11 +93,11 @@ LLDir_Linux::LLDir_Linux() ...@@ -93,11 +93,11 @@ LLDir_Linux::LLDir_Linux()
#else #else
mAppRODataDir = tmp_str; mAppRODataDir = tmp_str;
#endif #endif
std::string::size_type indra_pos = mExecutableDir.find("/indra"); std::string::size_type build_dir_pos = mExecutableDir.find("/build-linux-");
if (indra_pos != std::string::npos) if (build_dir_pos != std::string::npos)
{ {
// ...we're in a dev checkout // ...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 " llinfos << "Running in dev checkout with mSkinBaseDir "
<< mSkinBaseDir << llendl; << mSkinBaseDir << llendl;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment