From 57df044612f79aa90a68bd48657b0f3c1d6a4ddf Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Tue, 22 Sep 2020 19:26:23 +0200
Subject: [PATCH] FIRE-29930: Don't include general global settings in camera
 presets

---
 indra/newview/app_settings/camera/Front.xml | 22 ---------------------
 indra/newview/app_settings/camera/Rear.xml  | 22 ---------------------
 indra/newview/app_settings/camera/Side.xml  | 22 ---------------------
 indra/newview/llpresetsmanager.cpp          |  9 ++++-----
 4 files changed, 4 insertions(+), 71 deletions(-)

diff --git a/indra/newview/app_settings/camera/Front.xml b/indra/newview/app_settings/camera/Front.xml
index f9f615c4a7..1bf35c8682 100644
--- a/indra/newview/app_settings/camera/Front.xml
+++ b/indra/newview/app_settings/camera/Front.xml
@@ -1,16 +1,5 @@
 <llsd>
     <map>
-    <key>AppearanceCameraMovement</key>
-        <map>
-        <key>Comment</key>
-            <string>When entering appearance editing mode, camera zooms in on currently selected portion of avatar</string>
-        <key>Persist</key>
-            <integer>1</integer>
-        <key>Type</key>
-            <string>Boolean</string>
-        <key>Value</key>
-            <integer>1</integer>
-        </map>
     <key>AvatarSitRotation</key>
     <map>
         <key>Comment</key>
@@ -90,17 +79,6 @@
         <key>Value</key>
             <real>0.90322577953338623</real>
         </map>
-    <key>EditCameraMovement</key>
-        <map>
-        <key>Comment</key>
-            <string>When entering build mode, camera moves up above avatar</string>
-        <key>Persist</key>
-            <integer>1</integer>
-        <key>Type</key>
-            <string>Boolean</string>
-        <key>Value</key>
-            <integer>0</integer>
-        </map>
     <key>FocusOffsetRearView</key>
         <map>
         <key>Comment</key>
diff --git a/indra/newview/app_settings/camera/Rear.xml b/indra/newview/app_settings/camera/Rear.xml
index a084f83bfe..a4de53d698 100644
--- a/indra/newview/app_settings/camera/Rear.xml
+++ b/indra/newview/app_settings/camera/Rear.xml
@@ -1,16 +1,5 @@
 <llsd>
     <map>
-    <key>AppearanceCameraMovement</key>
-        <map>
-        <key>Comment</key>
-            <string>When entering appearance editing mode, camera zooms in on currently selected portion of avatar</string>
-        <key>Persist</key>
-            <integer>1</integer>
-        <key>Type</key>
-            <string>Boolean</string>
-        <key>Value</key>
-            <integer>1</integer>
-        </map>
     <key>AvatarSitRotation</key>
     <map>
         <key>Comment</key>
@@ -90,17 +79,6 @@
         <key>Value</key>
             <real>0.90322577953338623</real>
         </map>
-    <key>EditCameraMovement</key>
-        <map>
-        <key>Comment</key>
-            <string>When entering build mode, camera moves up above avatar</string>
-        <key>Persist</key>
-            <integer>1</integer>
-        <key>Type</key>
-            <string>Boolean</string>
-        <key>Value</key>
-            <integer>0</integer>
-        </map>
     <key>FocusOffsetRearView</key>
         <map>
         <key>Comment</key>
diff --git a/indra/newview/app_settings/camera/Side.xml b/indra/newview/app_settings/camera/Side.xml
index 5db5b164bd..0ff6c5ae3f 100644
--- a/indra/newview/app_settings/camera/Side.xml
+++ b/indra/newview/app_settings/camera/Side.xml
@@ -1,16 +1,5 @@
 <llsd>
     <map>
-    <key>AppearanceCameraMovement</key>
-        <map>
-        <key>Comment</key>
-            <string>When entering appearance editing mode, camera zooms in on currently selected portion of avatar</string>
-        <key>Persist</key>
-            <integer>1</integer>
-        <key>Type</key>
-            <string>Boolean</string>
-        <key>Value</key>
-            <integer>1</integer>
-        </map>
     <key>AvatarSitRotation</key>
     <map>
         <key>Comment</key>
@@ -90,17 +79,6 @@
         <key>Value</key>
             <real>0.90322577953338623</real>
         </map>
-    <key>EditCameraMovement</key>
-        <map>
-        <key>Comment</key>
-            <string>When entering build mode, camera moves up above avatar</string>
-        <key>Persist</key>
-            <integer>1</integer>
-        <key>Type</key>
-            <string>Boolean</string>
-        <key>Value</key>
-            <integer>0</integer>
-        </map>
     <key>FocusOffsetRearView</key>
         <map>
         <key>Comment</key>
diff --git a/indra/newview/llpresetsmanager.cpp b/indra/newview/llpresetsmanager.cpp
index f4d6ec4ae1..d99466ec28 100644
--- a/indra/newview/llpresetsmanager.cpp
+++ b/indra/newview/llpresetsmanager.cpp
@@ -275,8 +275,10 @@ void LLPresetsManager::getControlNames(std::vector<std::string>& names)
 		// From panel_preferences_move.xml
 		("CameraAngle")
 		("CameraOffsetScale")
-		("EditCameraMovement")
-		("AppearanceCameraMovement")
+		// <FS:Ansariel> FIRE-29930: Don't include these settings as it might be confusing why settings suddenly reset
+		//("EditCameraMovement")
+		//("AppearanceCameraMovement")
+		// </FS:Ansariel>
 		// From llagentcamera.cpp
 		("CameraOffsetBuild")
 		("TrackFocusObject")
@@ -286,9 +288,6 @@ void LLPresetsManager::getControlNames(std::vector<std::string>& names)
 		// <FS:Ansariel> Additional settings
 		("ZoomTime")
 		("CameraPositionSmoothing")
-		("EditAppearanceLighting")
-		("FSDisableMouseWheelCameraZoom")
-		("DisableCameraConstraints")
 		// </FS:Ansariel>
         ;
     names = camera_controls;