From 469f2621f170484943093a830ec385f1b8d20934 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 17 Jan 2024 00:30:37 +0200
Subject: SL-20708 don't reset "Quality & speed" slider when canceling Advanced
 Settings

---
 indra/newview/llfloaterpreference.h | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'indra/newview/llfloaterpreference.h')

diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index 04ac87364d..bdade3c1b9 100644
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -79,7 +79,7 @@ public:
 	~LLFloaterPreference();
 
 	void apply();
-	void cancel();
+	void cancel(const std::vector<std::string> settings_to_skip = {});
 	/*virtual*/ void draw();
 	/*virtual*/ BOOL postBuild();
 	/*virtual*/ void onOpen(const LLSD& key);
@@ -251,7 +251,7 @@ public:
 	virtual ~LLPanelPreference();
 
 	virtual void apply();
-	virtual void cancel();
+    virtual void cancel(const std::vector<std::string> settings_to_skip = {});
 	void setControlFalse(const LLSD& user_data);
 	virtual void setHardwareDefaults();
 
@@ -294,14 +294,12 @@ class LLPanelPreferenceGraphics : public LLPanelPreference
 public:
 	BOOL postBuild();
 	void draw();
-	void cancel();
+    void cancel(const std::vector<std::string> settings_to_skip = {});
 	void saveSettings();
 	void resetDirtyChilds();
 	void setHardwareDefaults();
 	void setPresetText();
 
-	static const std::string getPresetsPath();
-
 protected:
 	bool hasDirtyChilds();
 
@@ -320,7 +318,7 @@ public:
 	BOOL postBuild();
 
 	void apply();
-	void cancel();
+    void cancel(const std::vector<std::string> settings_to_skip = {});
 	void saveSettings();
 	void resetDirtyChilds();
 
-- 
cgit v1.2.3