Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

In dev checkouts, AppViewer now sets AppRoDataDir to newview

Browse Source 
Crossplatform, settings, windlights, skins, the works~
No more copying~ <3
This commit is contained in:
Lirusaito
2019-03-26 02:23:51 -04:00
parent a8f85f0d91
commit f2b39196a0
4 changed files with 20 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
indra/llvfs/lldir_linux.cpp
View File

@@ -93,22 +93,7 @@ LLDir_Linux::LLDir_Linux()
#else
mAppRODataDir = tmp_str;
#endif
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, build_dir_pos) + "/indra/newview/skins";
if (LLFile::isdir(mSkinBaseDir))
LL_INFOS() << "Running in dev checkout with mSkinBaseDir "
<< mSkinBaseDir << LL_ENDL;
else
mSkinBaseDir.clear();
}
if (mSkinBaseDir.empty())
{
// ...normal installation running
mSkinBaseDir = mAppRODataDir + mDirDelimiter + "skins";
}
mSkinBaseDir = mAppRODataDir + mDirDelimiter + "skins";
mOSUserDir = getCurrentUserHome(tmp_str);
mOSUserAppDir = "";