From b1d726b0704d2b3448abc65517e21678d5b299e8 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sun, 12 Mar 2023 21:24:00 -0400
Subject: [PATCH] Partial revert of ignore graphics adapter change
---
indra/newview/llstartup.cpp | 5 ++---
indra/newview/llviewerwindow.cpp | 1 +
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 6b3eda82e7b..81b96fae338 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -300,7 +300,6 @@ void transition_back_to_login_panel(const std::string& emsg);
// [SL:KB] - Patch: Chat-Alerts | Checked: 2012-09-22 (Catznip-3.3)
void handleLoadChatAlertSounds();
// [/SL:KB]
-bool callbackConfirmDisplayPreferencesReset(const LLSD& notification, const LLSD& response);
void callback_cache_name(const LLUUID& id, const std::string& full_name, bool is_group)
{
@@ -436,12 +435,12 @@ bool idle_startup()
{
LLNotificationsUtil::add("DisplaySetToRecommendedFeatureChange");
}
- else if ( ! lastGPU.empty() && lastGPU != thisGPU && !gSavedSettings.getBool("AlchemyKeepSettingsOnGPUChange"))
+ else if ( ! lastGPU.empty() && (lastGPU != thisGPU))
{
LLSD subs;
subs["LAST_GPU"] = lastGPU;
subs["THIS_GPU"] = thisGPU;
- LLNotificationsUtil::add("AskForDisplayPreferencesReset", subs, LLSD(), callbackConfirmDisplayPreferencesReset);
+ LLNotificationsUtil::add("DisplaySetToRecommendedGPUChange", subs);
}
else if (!gViewerWindow->getInitAlert().empty())
{
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index eb9aa70e59a..5e8ec6b67d6 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -2053,6 +2053,7 @@ LLViewerWindow::LLViewerWindow(const Params& p)
|| (gSavedSettings.getString("LastGPUString") != LLFeatureManager::getInstance()->getGPUString())
|| (gSavedSettings.getBOOL("ProbeHardwareOnStartup")))
{
+ LLFeatureManager::getInstance()->applyRecommendedSettings();
gSavedSettings.setBOOL("ProbeHardwareOnStartup", FALSE);
}
--
GitLab