livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
meow-7.2.2
Vadim ProductEngine 2011-04-19 23:46:18 +03:00
parent b8069d1c25
commit 27301aa546
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llvfs/lldir_linux.cpp
View File

@ -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;
}