From 018585320b59b9352e10b9593822be2e7ce3e878 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Mon, 13 Apr 2020 04:09:51 -0400
Subject: [PATCH] Use AlchemyNext as appdata dir to prevent conflict with
existing alchemy
---
indra/llcrashlogger/llcrashlogger.cpp | 2 +-
indra/llvfs/lldir.cpp | 2 +-
indra/newview/llappviewer.cpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp
index ff6ec202b1e..8f242a6875a 100644
--- a/indra/llcrashlogger/llcrashlogger.cpp
+++ b/indra/llcrashlogger/llcrashlogger.cpp
@@ -564,7 +564,7 @@ bool LLCrashLogger::init()
LLCore::LLHttp::initialize();
// We assume that all the logs we're looking for reside on the current drive
- gDirUtilp->initAppDirs("SecondLife");
+ gDirUtilp->initAppDirs("AlchemyNext");
LLError::initForApplication(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, ""), gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, ""));
diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp
index 54babb6ad9a..f9ed402c9e7 100644
--- a/indra/llvfs/lldir.cpp
+++ b/indra/llvfs/lldir.cpp
@@ -385,7 +385,7 @@ std::string LLDir::buildSLOSCacheDir() const
}
else
{
- res = add(getOSCacheDir(), "SecondLife");
+ res = add(getOSCacheDir(), "AlchemyNext");
}
return res;
}
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index aa5551d3314..7bb0af38c14 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -711,7 +711,7 @@ LLAppViewer::LLAppViewer()
// 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");
+ gDirUtilp->initAppDirs("AlchemyNext");
//
// IMPORTANT! Do NOT put anything that will write
// into the log files during normal startup until AFTER
--
GitLab