From b923f6f671b164dfbc0d3d6137076764b3f22666 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Mon, 11 Sep 2023 19:49:19 +0300
Subject: SL-20277 remove settings from camera presets

---
 indra/newview/llpresetsmanager.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'indra/newview/llpresetsmanager.cpp')

diff --git a/indra/newview/llpresetsmanager.cpp b/indra/newview/llpresetsmanager.cpp
index 30d0a22ef0..bc77588b9f 100644
--- a/indra/newview/llpresetsmanager.cpp
+++ b/indra/newview/llpresetsmanager.cpp
@@ -254,8 +254,6 @@ void LLPresetsManager::getControlNames(std::vector<std::string>& names)
 		// From panel_preferences_move.xml
 		("CameraAngle")
 		("CameraOffsetScale")
-		("EditCameraMovement")
-		("AppearanceCameraMovement")
 		// From llagentcamera.cpp
 		("CameraOffsetBuild")
 		("TrackFocusObject")
-- 
cgit v1.3


From 7e66f6ca18e667093ac6b505badf25d467e5acff Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Mon, 13 Nov 2023 19:33:18 +0200
Subject: SL-20277 ignore both settings when loading camera preset

---
 indra/newview/llpresetsmanager.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'indra/newview/llpresetsmanager.cpp')

diff --git a/indra/newview/llpresetsmanager.cpp b/indra/newview/llpresetsmanager.cpp
index bc77588b9f..1fcc456d62 100644
--- a/indra/newview/llpresetsmanager.cpp
+++ b/indra/newview/llpresetsmanager.cpp
@@ -458,6 +458,9 @@ void LLPresetsManager::loadPreset(const std::string& subdirectory, std::string n
 
     LL_DEBUGS() << "attempting to load preset '"<<name<<"' from '"<<full_path<<"'" << LL_ENDL;
 
+    bool appearance_camera_movement = gSavedSettings.getBOOL("AppearanceCameraMovement");
+    bool edit_camera_movement = gSavedSettings.getBOOL("EditCameraMovement");
+
 	mIgnoreChangedSignal = true;
 	if(gSavedSettings.loadFromFile(full_path, false, true) > 0)
 	{
@@ -477,6 +480,16 @@ void LLPresetsManager::loadPreset(const std::string& subdirectory, std::string n
 		{
 			gSavedSettings.setString("PresetCameraActive", name);
 			triggerChangeCameraSignal();
+
+            //SL-20277 old preset files may contain settings that should be ignored when loading camera presets
+            if (appearance_camera_movement != (bool)gSavedSettings.getBOOL("AppearanceCameraMovement"))
+            {
+                gSavedSettings.setBOOL("AppearanceCameraMovement", appearance_camera_movement);
+            }
+            if (edit_camera_movement != (bool)gSavedSettings.getBOOL("EditCameraMovement"))
+            {
+                gSavedSettings.setBOOL("EditCameraMovement", edit_camera_movement);
+            }
 		}
 	}
 	else
-- 
cgit v1.3