From 688c5c6d071c00b5401a6a3d1094e648c490eb4a Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Wed, 8 Sep 2021 17:18:41 -0400
Subject: [PATCH] Remove settings from camera presets that are just plain
bizarre to include
---
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 | 2 --
4 files changed, 68 deletions(-)
diff --git a/indra/newview/app_settings/camera/Front.xml b/indra/newview/app_settings/camera/Front.xml
index f9f615c4a7b..1bf35c8682d 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 a084f83bfe1..a4de53d698f 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 5db5b164bdb..0ff6c5ae3fd 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 ce0de1dbbd8..50a796b4c22 100644
--- a/indra/newview/llpresetsmanager.cpp
+++ b/indra/newview/llpresetsmanager.cpp
@@ -250,8 +250,6 @@ void LLPresetsManager::getCameraControlNames(std::vector<std::string>& names)
// From panel_preferences_move.xml
("CameraAngle")
("CameraOffsetScale")
- ("EditCameraMovement")
- ("AppearanceCameraMovement")
// From llagentcamera.cpp
("CameraOffsetBuild")
("TrackFocusObject")
--
GitLab