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 = "";

17
indra/llvfs/lldir_mac.cpp
View File

@@ -149,21 +149,8 @@ LLDir_Mac::LLDir_Mac()
CFURLRef resourcesURLRef = CFBundleCopyResourcesDirectoryURL(mainBundleRef);
CFURLRefToLLString(resourcesURLRef, mAppRODataDir, true);
size_t build_dir_pos = mExecutableDir.rfind("/indra/build-darwin-");
if (build_dir_pos != std::string::npos)
{
// ...we're in a dev checkout
mSkinBaseDir = mExecutableDir.substr(0, build_dir_pos)
+ "/indra/newview/skins";
LL_INFOS() << "Running in dev checkout with mSkinBaseDir "
<< mSkinBaseDir << LL_ENDL;
}
else
{
// ...normal installation running
mSkinBaseDir = mAppRODataDir + mDirDelimiter + "skins";
}
mSkinBaseDir = mAppRODataDir + mDirDelimiter + "skins";
// mOSUserDir
error = FSFindFolder(kUserDomain, kApplicationSupportFolderType, true, &fileRef);

13
indra/llvfs/lldir_win32.cpp
View File

@@ -140,18 +140,7 @@ LLDir_Win32::LLDir_Win32()
// LL_INFOS() << "mAppRODataDir = " << mAppRODataDir << LL_ENDL;
auto build_dir_pos = mExecutableDir.rfind("build-");
if (build_dir_pos != std::string::npos)
{
// ...we're in a dev checkout
mSkinBaseDir = mExecutableDir.substr(0, build_dir_pos) + "indra" + mDirDelimiter + "newview" + mDirDelimiter + "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";
// Build the default cache directory
mDefaultCacheDir = buildSLOSCacheDir();

18
indra/newview/llappviewer.cpp
View File

@@ -566,11 +566,25 @@ LLAppViewer::LLAppViewer() :
LL_ERRS() << "Oh no! An instance of LLAppViewer already exists! LLAppViewer is sort of like a singleton." << LL_ENDL;
}
mDumpPath ="";
mDumpPath.clear();
// Need to do this initialization before we do anything else, since anything
// that touches files should really go through the lldir API
gDirUtilp->initAppDirs("SecondLife");
{
std::string newview_path;
const auto& exe_dir = gDirUtilp->getExecutableDir();
auto build_dir_pos = exe_dir.rfind("build-");
if (build_dir_pos != std::string::npos)
{
// ...we're in a dev checkout
newview_path = gDirUtilp->add(gDirUtilp->add(exe_dir.substr(0, build_dir_pos), "indra"), "newview");
if (LLFile::isdir(newview_path))
LL_INFOS() << "Running in dev checkout with newview " << newview_path << LL_ENDL;
else newview_path.clear();
}
gDirUtilp->initAppDirs("SecondLife", newview_path);
}
sInstance = this;
}