From 5c4ae5b11a44ab4711f0148cb721f35be9f18100 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Thu, 23 Feb 2017 17:50:36 -0500
Subject: STORM-2145 Camera Presets -- some initial work

---
 .../skins/default/textures/icons/Presets_Icon.png  | Bin 366 -> 0 bytes
 .../default/textures/icons/Presets_Icon_Camera.png | Bin 0 -> 1381 bytes
 .../textures/icons/Presets_Icon_Graphic.png        | Bin 0 -> 366 bytes
 indra/newview/skins/default/textures/textures.xml  |   3 +-
 .../skins/default/xui/en/floater_camera.xml        |  38 ++++++-
 .../skins/default/xui/en/floater_preferences.xml   |   2 +-
 .../default/xui/en/panel_preferences_graphics1.xml |  16 ++-
 .../default/xui/en/panel_preferences_move.xml      | 123 ++++++++++++++++++---
 .../xui/en/panel_presets_camera_pulldown.xml       |  69 ++++++++++++
 .../skins/default/xui/en/panel_status_bar.xml      |  14 ++-
 10 files changed, 240 insertions(+), 25 deletions(-)
 delete mode 100644 indra/newview/skins/default/textures/icons/Presets_Icon.png
 create mode 100644 indra/newview/skins/default/textures/icons/Presets_Icon_Camera.png
 create mode 100644 indra/newview/skins/default/textures/icons/Presets_Icon_Graphic.png
 create mode 100644 indra/newview/skins/default/xui/en/panel_presets_camera_pulldown.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/icons/Presets_Icon.png b/indra/newview/skins/default/textures/icons/Presets_Icon.png
deleted file mode 100644
index 5a6628816b..0000000000
Binary files a/indra/newview/skins/default/textures/icons/Presets_Icon.png and /dev/null differ
diff --git a/indra/newview/skins/default/textures/icons/Presets_Icon_Camera.png b/indra/newview/skins/default/textures/icons/Presets_Icon_Camera.png
new file mode 100644
index 0000000000..8cb51cdc8e
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Presets_Icon_Camera.png differ
diff --git a/indra/newview/skins/default/textures/icons/Presets_Icon_Graphic.png b/indra/newview/skins/default/textures/icons/Presets_Icon_Graphic.png
new file mode 100644
index 0000000000..5a6628816b
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Presets_Icon_Graphic.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index f2da22256c..de9ed4d479 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -205,7 +205,8 @@ with the same filename but different name
 
   <texture name="Facebook_Icon" file_name="icons/Facebook.png" preload="false" />
 
-  <texture name="Presets_Icon" file_name="icons/Presets_Icon.png" preload="true" />
+  <texture name="Presets_Icon_Graphic" file_name="icons/Presets_Icon_Graphic.png" preload="true" />
+  <texture name="Presets_Icon_Camera" file_name="icons/Presets_Icon_Camera.png" preload="true" />
 
   <texture name="Favorite_Star_Active" file_name="navbar/Favorite_Star_Active.png" preload="false" />
   <texture name="Favorite_Star_Off" file_name="navbar/Favorite_Star_Off.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 521389d7b3..4eec922915 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -150,8 +150,26 @@
             left="0"
             mouse_opaque="false"
             name="zoom"
-            top="20"
+            top="0"
             width="226">
+         <slider
+            can_edit_text="true"
+            control_name="CameraAngle"
+            decimal_digits="2"
+            follows="left|top"
+            height="16"
+            top="20"
+            increment="0.025"
+            initial_value="1.57"
+            layout="topleft"
+            label_width="112"
+            label="View angle"
+            left="10"
+            max_val="1.6"
+            min_val="0.17"
+            name="camera_fov"
+            show_text="false"
+            width="200" />
            <joystick_rotate
               follows="top|left"
               height="78"
@@ -162,7 +180,7 @@
               sound_flags="3"
               visible="true"
               tool_tip="Orbit camera around focus"
-              top="20"
+              top_delta="20"
               width="78" />                      
            <button
               follows="top|left"
@@ -174,7 +192,7 @@
               left_pad="14" 
               name="zoom_plus_btn"
               width="18"
-              top="18">
+              top="38">
              <commit_callback
                 function="Zoom.plus" />
              <mouse_held_callback
@@ -219,7 +237,7 @@
          scale_image="false"
          sound_flags="3"
          tool_tip="Move camera up and down, left and right"
-         top="20"
+         top="40"
          width="78"/>
         </panel>
     </panel>
@@ -270,5 +288,17 @@
          tool_tip="Camera modes"
          width="25">
         </button>
+
+	<button
+		name="open_prefs_btn"
+		image_overlay="Icon_Gear_Foreground"
+		tool_tip = "Open view preferences"
+		left_pad="45"
+		height="22"
+		width="28">
+	  <button.commit_callback
+		  function="Presets.GoViewPrefs" />
+	</button>
+
     </panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 9a9101e0da..cbaeae5b94 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -79,7 +79,7 @@
          help_topic="preferences_chat_tab"
          name="chat" />
         <panel
-		 class="panel_preference"
+		 class="panel_preference_view"
          filename="panel_preferences_move.xml"
          label="Move &amp; View"
          layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 32cbbff8b7..f0979915ce 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -266,6 +266,21 @@
        0
   </text>
 
+<text
+type="string"
+length="1"
+follows="left|top"
+height="16"
+layout="topleft"
+left_delta="68"
+name="IndirectMaxComplexityLink"
+mouse_opaque="false"
+top_delta="0"
+width="120">
+[https://community.secondlife.com/t5/Featured-News/Why-are-all-these-people-made-of-colored-jelly/ba-p/3031255 What's this?]
+</text>
+
+
   <check_box
     control_name="WindLightUseAtmosShaders"
     height="16"
@@ -323,7 +338,6 @@
       function="Pref.PrefLoad"
 	  parameter="graphic"/>
   </button>
-         min_val="0.125"
 
   <button
     follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index 8794e3bf95..e4a5f5e283 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -2,13 +2,14 @@
 <panel
  border="true"
  follows="left|top|right|bottom"
- height="408"
+ height="418"
  label="Move"
  layout="topleft"
  left="102"
  name="move_panel"
  top="1"
  width="517">
+
   <icon
      follows="left|top"
      height="18"
@@ -19,19 +20,41 @@
      visible="true"
      width="18"
      left="30"
-     top="10"/>
+     top="4"/>
+
+  <text
+    follows="top|left|right"
+    height="16"
+    layout="topleft"
+    left="80"
+    top_delta="0"
+    width="100">
+      Preset in use:
+  </text>
+
+  <text
+    follows="top|left|right"
+    height="16"
+    layout="topleft"
+    left_delta="100"
+    name="preset_camera_text"
+    width="120">
+      (None)
+  </text>
+
   <slider
    can_edit_text="true"
    control_name="CameraAngle"
    decimal_digits="2"
    follows="left|top"
    height="16"
+   top_pad="5"
    increment="0.025"
    initial_value="1.57"
    layout="topleft"
    label_width="100"
    label="View angle"
-   left_pad="30"
+   left="80"
    max_val="2.97"
    min_val="0.17"
    name="camera_fov"
@@ -62,21 +85,38 @@
   height="10"
   left="80"
   name="heading2"
-  width="270"
+  width="200"
   top_pad="5">
     Automatic position for:
   </text>
+
+  <spinner
+   control_name="CameraOpacity"
+   decimal_digits="1"
+   follows="top|left|right"
+   height="24"
+   max_val="1.0"
+   min_val="0.0"
+   increment="0.1"
+   initial_value="1.0"
+   label="Camera controls opacity:"
+   label_width="180"
+   layout="topleft"
+   top_pad="-10"
+   left_pad="10"
+   width="220" />
+
   <check_box
      control_name="EditCameraMovement"
      height="20"
      follows="left|top"
      label="Build/Edit"
      layout="topleft"
-     left_delta="30"
+     left="100"
      name="edit_camera_movement"
      tool_tip="Use automatic camera positioning when entering and exiting edit mode"
      width="280"
-     top_pad="5" />
+     top_pad="-10" />
   <check_box
    control_name="AppearanceCameraMovement"
    follows="left|top"
@@ -86,16 +126,68 @@
    name="appearance_camera_movement"
    tool_tip="Use automatic camera positioning while in edit mode"
    width="242" />
+
+  <button
+    follows="top|left"
+    height="23"
+    label="Save settings as a preset..."
+    layout="topleft"
+    left="30"
+    name="PrefCameraSaveButton"
+    top_pad="10"
+    width="200">
+    <button.commit_callback
+      function="Pref.PrefSave"
+      parameter="camera" />
+  </button>
+
+  <button
+    follows="top|left"
+    height="23"
+    label="Load preset..."
+    layout="topleft"
+    left_pad="10"
+    name="PrefCameraLoadButton"
+    top_delta="0"
+    width="115">
+    <button.commit_callback
+      function="Pref.PrefLoad"
+	  parameter="camera"/>
+  </button>
+
+  <button
+    follows="top|left"
+    height="23"
+    label="Delete preset..."
+    layout="topleft"
+    left_pad="10"
+    name="PrefCameraDeleteButton"
+    top_delta="0"
+    width="115">
+    <button.commit_callback
+      function="Pref.PrefDelete"
+	  parameter="camera"/>
+  </button>
+
+  <view_border
+    bevel_style="in"
+    follows="left|top|right"
+    height="0"
+    layout="topleft"
+    left="10"
+    top_pad="5"
+    width="500"/>
+
   <icon
-	 follows="left|top"
-	 height="18"
-	 image_name="Move_Walk_Off"
+   follows="left|top"
+   height="18"
+   image_name="Move_Walk_Off"
    layout="topleft"
-	 name="avatar_icon"
-	 mouse_opaque="false"
-	 visible="true"
-	 width="18"
-   top_pad="10"
+   name="avatar_icon"
+   mouse_opaque="false"
+   visible="true"
+   width="18"
+   top_pad="4"
    left="30" />
   <text
    follows="left|top"
@@ -264,10 +356,11 @@
    label="Other Devices"
    left="30"
    name="joystick_setup_button"
-   top="30"
+   top_pad="5"
    width="155">
     <button.commit_callback
      function="Floater.Show"
      parameter="pref_joystick" />
   </button>
+
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_presets_camera_pulldown.xml b/indra/newview/skins/default/xui/en/panel_presets_camera_pulldown.xml
new file mode 100644
index 0000000000..dc37270751
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_presets_camera_pulldown.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_opaque="true"
+ background_visible="true"
+ bg_opaque_image="Volume_Background"
+ bg_alpha_image="Volume_Background"
+ border_visible="false"
+ border="false"
+ chrome="true"
+ follows="bottom"
+ height="155"
+ layout="topleft"
+ name="presets_camera_pulldown"
+ width="225">
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="12"
+    layout="topleft"
+    top="4"
+    left_delta="5"
+    font.style="BOLD"
+    name="Camera Presets"
+    width="120">
+      Camera Presets
+  </text>
+  <scroll_list
+    follows="left|top"
+    layout="topleft"
+    column_padding="0"
+    height="100"
+    width="215"
+    draw_heading="false"
+    draw_stripes="false"
+    bg_stripe_color="0.25 0.25 0.25 0.25"
+    top_delta="15"
+    left_delta="0"
+    name="preset_camera_list">
+    <scroll_list.columns
+      name="icon"
+      width="16" />
+    <scroll_list.columns
+      relative_width="1"
+      name="preset_name" />
+      <scroll_list.commit_callback
+      function="PresetsCamera.RowClick" />
+  </scroll_list>
+  <view_border
+    bevel_style="none"
+    follows="top|left"
+    height="0"
+    layout="topleft"
+    left="5"
+    name="horiz_separator"
+    top_delta="105"
+    width="215" />
+  <button
+    name="open_prefs_btn"
+    label="Open View Preferences"
+    tool_tip = "Bring up view preferences"
+    top_delta="5"
+    left="15"
+    height="20"
+    width="200">
+    <button.commit_callback
+      function="Presets.GoViewPrefs" />
+  </button>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 998f1ce599..c6a42ea612 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -35,7 +35,7 @@
     </panel.string>
   <panel
     height="18"
-    left="-416"
+    left="-458"
     width="185"
     top="1"
     follows="right|top" 
@@ -108,10 +108,18 @@
     <icon
      follows="right|top"
      height="16"
-     image_name="Presets_Icon"
+     image_name="Presets_Icon_Camera"
      left_pad="8"
      top="2"
-     name="presets_icon"
+     name="presets_icon_camera"
+     width="18" />
+    <icon
+     follows="right|top"
+     height="16"
+     image_name="Presets_Icon_Graphic"
+     left_pad="8"
+     top="2"
+     name="presets_icon_graphic"
      width="18" />
     <button
      follows="right|top"
-- 
cgit v1.2.3


From 32f16633c77564d567ed0752e56eb38abb916ccd Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Thu, 11 Jan 2018 18:35:35 -0500
Subject: STORM-2145 A few small changes

---
 .../default/textures/icons/Presets_Icon_Camera.png | Bin 1381 -> 0 bytes
 indra/newview/skins/default/textures/textures.xml  |   3 +--
 .../skins/default/xui/en/floater_camera.xml        |  29 +++++----------------
 .../skins/default/xui/en/panel_status_bar.xml      |   2 +-
 4 files changed, 9 insertions(+), 25 deletions(-)
 delete mode 100644 indra/newview/skins/default/textures/icons/Presets_Icon_Camera.png

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/icons/Presets_Icon_Camera.png b/indra/newview/skins/default/textures/icons/Presets_Icon_Camera.png
deleted file mode 100644
index 8cb51cdc8e..0000000000
Binary files a/indra/newview/skins/default/textures/icons/Presets_Icon_Camera.png and /dev/null differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index de9ed4d479..bc2abd0c02 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -98,7 +98,7 @@ with the same filename but different name
   <texture name="BuyArrow_Over" file_name="navbar/BuyArrow_Over.png" preload="true" scale.left="0" scale.top="1" scale.right="0" scale.bottom="0"  />
   <texture name="BuyArrow_Press" file_name="navbar/BuyArrow_Press.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0"  />
 
-  <texture name="Cam_Avatar_Off" file_name="bottomtray/Cam_Avatar_Off.png" preload="false" />
+  <texture name="Cam_Avatar_Off" file_name="bottomtray/Cam_Avatar_Off.png" preload="true" />
   <texture name="Cam_FreeCam_Off" file_name="bottomtray/Cam_FreeCam_Off.png" preload="false" />
   <texture name="Cam_Orbit_Off" file_name="bottomtray/Cam_Orbit_Off.png" preload="false" />
   <texture name="Cam_Pan_Off" file_name="bottomtray/Cam_Pan_Off.png" preload="false" />
@@ -206,7 +206,6 @@ with the same filename but different name
   <texture name="Facebook_Icon" file_name="icons/Facebook.png" preload="false" />
 
   <texture name="Presets_Icon_Graphic" file_name="icons/Presets_Icon_Graphic.png" preload="true" />
-  <texture name="Presets_Icon_Camera" file_name="icons/Presets_Icon_Camera.png" preload="true" />
 
   <texture name="Favorite_Star_Active" file_name="navbar/Favorite_Star_Active.png" preload="false" />
   <texture name="Favorite_Star_Off" file_name="navbar/Favorite_Star_Off.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 4eec922915..fdd27b35c2 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -250,18 +250,15 @@
      name="buttons"
      width="226">
         <button
-         height="23"
-         label=""
+         name="open_prefs_btn"
+         image_overlay="Icon_Gear_Foreground"
+         tool_tip = "Open view preferences"
          layout="topleft"
          left="70"
-         is_toggle="true"
-         image_overlay="Cam_Avatar_Off"
-         image_selected="PushButton_Selected_Press"
-         name="presets_btn"
-         tab_stop="false"
-         tool_tip="Preset Views"
-         top="13" 
-         width="25">
+         height="23"
+         width="28">
+           <button.commit_callback
+             function="Presets.GoViewPrefs" />
         </button>
         <button
          height="23"
@@ -288,17 +285,5 @@
          tool_tip="Camera modes"
          width="25">
         </button>
-
-	<button
-		name="open_prefs_btn"
-		image_overlay="Icon_Gear_Foreground"
-		tool_tip = "Open view preferences"
-		left_pad="45"
-		height="22"
-		width="28">
-	  <button.commit_callback
-		  function="Presets.GoViewPrefs" />
-	</button>
-
     </panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index c6a42ea612..299f019145 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -108,7 +108,7 @@
     <icon
      follows="right|top"
      height="16"
-     image_name="Presets_Icon_Camera"
+     image_name="Cam_Avatar_Off"
      left_pad="8"
      top="2"
      name="presets_icon_camera"
-- 
cgit v1.2.3


From 527388694a8bb3f3c3bf1510e1e79562dd426385 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Sat, 13 Jan 2018 12:18:40 -0500
Subject: STORM-2145 Added a small floater

---
 .../xui/en/floater_preferences_move_advanced.xml   | 140 +++++++++++++++++++++
 .../default/xui/en/panel_preferences_move.xml      |  14 +++
 2 files changed, 154 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_preferences_move_advanced.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_preferences_move_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_move_advanced.xml
new file mode 100644
index 0000000000..28e5d2c607
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_preferences_move_advanced.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ height="170"
+ layout="topleft"
+ name="floaterpreferencesmoveadvanced"
+ help_topic="floatermoveadvanced"
+ title="ADJUST CAMERA VIEW"
+ save_rect="true"
+ width="280">
+
+  <text
+    follows="top|left|right"
+    height="16"
+    layout="topleft"
+    left="10"
+    top="10"
+    width="100">
+      Camera offset:
+  </text>
+
+  <spinner
+   height="20"
+   label="X"
+   label_width="12"
+   follows="topl|eft"
+   left="10"
+   name="camera_x"
+   top_pad="5"
+   min_val="-1e+007"
+   max_val="1e+007"
+   width="70">
+    <spinner.commit_callback
+     function="CommitSettings" />
+  </spinner>
+
+  <spinner
+   height="20"
+   label="Y"
+   label_width="12"
+   follows="topl|eft"
+   name="camera_y"
+   left_pad="20"
+   min_val="-1e+007"
+   max_val="1e+007"
+   width="70">
+    <spinner.commit_callback
+     function="CommitSettings" />
+  </spinner>
+
+  <spinner
+   height="20"
+   label="Z"
+   label_width="12"
+   follows="topl|eft"
+   name="camera_z"
+   left_pad="20"
+   min_val="-1e+007"
+   max_val="1e+007"
+   width="70">
+    <spinner.commit_callback
+     function="CommitSettings" />
+  </spinner>
+
+  <text
+    follows="top|left|right"
+    height="16"
+    layout="topleft"
+    left="10"
+    top_pad="20"
+    width="100">
+      Focus offset:
+  </text>
+
+  <spinner
+   height="20"
+   label="X"
+   label_width="12"
+   follows="topl|eft"
+   left="10"
+   name="focus_x"
+   top_pad="5"
+   min_val="-1e+007"
+   max_val="1e+007"
+   width="70">
+    <spinner.commit_callback
+     function="CommitSettings" />
+  </spinner>
+
+  <spinner
+   height="20"
+   label="Y"
+   label_width="12"
+   follows="topl|eft"
+   name="focus_y"
+   left_pad="20"
+   min_val="-1e+007"
+   max_val="1e+007"
+   width="70">
+    <spinner.commit_callback
+     function="CommitSettings" />
+  </spinner>
+
+  <spinner
+   height="20"
+   label="Z"
+   label_width="12"
+   follows="topl|eft"
+   name="focus_z"
+   left_pad="20"
+   min_val="-1e+007"
+   max_val="1e+007"
+   width="70">
+    <spinner.commit_callback
+     function="CommitSettings" />
+  </spinner>
+
+  <button
+   follows="left|top"
+   height="23"
+   label="OK"
+   layout="topleft"
+   left="90"
+   name="ok"
+   top_pad="30"
+   width="90">
+    <button.commit_callback
+     function="Ok"/>
+  </button>
+  <button
+   follows="left|top"
+   height="23"
+   label="Cancel"
+   layout="topleft"
+   left_pad="5"
+   name="cancel"
+   width="90">
+    <button.commit_callback
+     function="Cancel"/>
+  </button>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index e4a5f5e283..d832dac4ff 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -127,6 +127,20 @@
    tool_tip="Use automatic camera positioning while in edit mode"
    width="242" />
 
+  <button
+    follows="top|left"
+    height="23"
+    label="Advanced..."
+    layout="topleft"
+    left_pad="-102"
+    name="PreferencesMoveAdvanced"
+    tool_tip="Adjust camera positioning"
+    width="115">
+    <button.commit_callback
+     function="Floater.Show"
+     parameter="prefs_move_advanced" />
+  </button>  
+
   <button
     follows="top|left"
     height="23"
-- 
cgit v1.2.3


From 3afaa799628c74abdd1542514bc3852432c3925b Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Mon, 15 Jan 2018 11:40:32 -0500
Subject: STORM-2145 Fixed bug.  Now you can only have one of the
 load/save/delete floaters open at once.

---
 .../default/xui/en/floater_delete_pref_preset.xml  |   2 +-
 .../default/xui/en/floater_load_pref_preset.xml    |   2 +-
 .../xui/en/floater_preferences_move_advanced.xml   | 140 ---------------------
 .../xui/en/floater_preferences_view_advanced.xml   | 140 +++++++++++++++++++++
 .../default/xui/en/floater_save_pref_preset.xml    |   2 +-
 .../default/xui/en/panel_preferences_move.xml      |   2 +-
 6 files changed, 144 insertions(+), 144 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/floater_preferences_move_advanced.xml
 create mode 100644 indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_delete_pref_preset.xml b/indra/newview/skins/default/xui/en/floater_delete_pref_preset.xml
index 0688fdb42c..3360d7bec9 100644
--- a/indra/newview/skins/default/xui/en/floater_delete_pref_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_delete_pref_preset.xml
@@ -4,7 +4,7 @@
  height="130"
  help_topic="floater_delete_preset"
  layout="topleft"
- name="Delete Pref Preset"
+ name="delete_pref_preset"
  save_rect="true"
  title="DELETE PREF PRESET"
  width="300">
diff --git a/indra/newview/skins/default/xui/en/floater_load_pref_preset.xml b/indra/newview/skins/default/xui/en/floater_load_pref_preset.xml
index 5f2eb770e2..49c21f1ea7 100644
--- a/indra/newview/skins/default/xui/en/floater_load_pref_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_load_pref_preset.xml
@@ -4,7 +4,7 @@
  height="130"
  help_topic="floater_load_preset"
  layout="topleft"
- name="Load Pref Preset"
+ name="load_pref_preset"
  save_rect="true"
  title="LOAD PREF PRESET"
  width="300">
diff --git a/indra/newview/skins/default/xui/en/floater_preferences_move_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_move_advanced.xml
deleted file mode 100644
index 28e5d2c607..0000000000
--- a/indra/newview/skins/default/xui/en/floater_preferences_move_advanced.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- height="170"
- layout="topleft"
- name="floaterpreferencesmoveadvanced"
- help_topic="floatermoveadvanced"
- title="ADJUST CAMERA VIEW"
- save_rect="true"
- width="280">
-
-  <text
-    follows="top|left|right"
-    height="16"
-    layout="topleft"
-    left="10"
-    top="10"
-    width="100">
-      Camera offset:
-  </text>
-
-  <spinner
-   height="20"
-   label="X"
-   label_width="12"
-   follows="topl|eft"
-   left="10"
-   name="camera_x"
-   top_pad="5"
-   min_val="-1e+007"
-   max_val="1e+007"
-   width="70">
-    <spinner.commit_callback
-     function="CommitSettings" />
-  </spinner>
-
-  <spinner
-   height="20"
-   label="Y"
-   label_width="12"
-   follows="topl|eft"
-   name="camera_y"
-   left_pad="20"
-   min_val="-1e+007"
-   max_val="1e+007"
-   width="70">
-    <spinner.commit_callback
-     function="CommitSettings" />
-  </spinner>
-
-  <spinner
-   height="20"
-   label="Z"
-   label_width="12"
-   follows="topl|eft"
-   name="camera_z"
-   left_pad="20"
-   min_val="-1e+007"
-   max_val="1e+007"
-   width="70">
-    <spinner.commit_callback
-     function="CommitSettings" />
-  </spinner>
-
-  <text
-    follows="top|left|right"
-    height="16"
-    layout="topleft"
-    left="10"
-    top_pad="20"
-    width="100">
-      Focus offset:
-  </text>
-
-  <spinner
-   height="20"
-   label="X"
-   label_width="12"
-   follows="topl|eft"
-   left="10"
-   name="focus_x"
-   top_pad="5"
-   min_val="-1e+007"
-   max_val="1e+007"
-   width="70">
-    <spinner.commit_callback
-     function="CommitSettings" />
-  </spinner>
-
-  <spinner
-   height="20"
-   label="Y"
-   label_width="12"
-   follows="topl|eft"
-   name="focus_y"
-   left_pad="20"
-   min_val="-1e+007"
-   max_val="1e+007"
-   width="70">
-    <spinner.commit_callback
-     function="CommitSettings" />
-  </spinner>
-
-  <spinner
-   height="20"
-   label="Z"
-   label_width="12"
-   follows="topl|eft"
-   name="focus_z"
-   left_pad="20"
-   min_val="-1e+007"
-   max_val="1e+007"
-   width="70">
-    <spinner.commit_callback
-     function="CommitSettings" />
-  </spinner>
-
-  <button
-   follows="left|top"
-   height="23"
-   label="OK"
-   layout="topleft"
-   left="90"
-   name="ok"
-   top_pad="30"
-   width="90">
-    <button.commit_callback
-     function="Ok"/>
-  </button>
-  <button
-   follows="left|top"
-   height="23"
-   label="Cancel"
-   layout="topleft"
-   left_pad="5"
-   name="cancel"
-   width="90">
-    <button.commit_callback
-     function="Cancel"/>
-  </button>
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml
new file mode 100644
index 0000000000..5b2cbee914
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ height="170"
+ layout="topleft"
+ name="floaterpreferencesviewadvanced"
+ help_topic="floaterviewadvanced"
+ title="ADJUST CAMERA VIEW"
+ save_rect="true"
+ width="280">
+
+  <text
+    follows="top|left|right"
+    height="16"
+    layout="topleft"
+    left="10"
+    top="10"
+    width="100">
+      Camera offset:
+  </text>
+
+  <spinner
+   height="20"
+   label="X"
+   label_width="12"
+   follows="topl|eft"
+   left="10"
+   name="camera_x"
+   top_pad="5"
+   min_val="-1e+007"
+   max_val="1e+007"
+   width="70">
+    <spinner.commit_callback
+     function="CommitSettings" />
+  </spinner>
+
+  <spinner
+   height="20"
+   label="Y"
+   label_width="12"
+   follows="topl|eft"
+   name="camera_y"
+   left_pad="20"
+   min_val="-1e+007"
+   max_val="1e+007"
+   width="70">
+    <spinner.commit_callback
+     function="CommitSettings" />
+  </spinner>
+
+  <spinner
+   height="20"
+   label="Z"
+   label_width="12"
+   follows="topl|eft"
+   name="camera_z"
+   left_pad="20"
+   min_val="-1e+007"
+   max_val="1e+007"
+   width="70">
+    <spinner.commit_callback
+     function="CommitSettings" />
+  </spinner>
+
+  <text
+    follows="top|left|right"
+    height="16"
+    layout="topleft"
+    left="10"
+    top_pad="20"
+    width="100">
+      Focus offset:
+  </text>
+
+  <spinner
+   height="20"
+   label="X"
+   label_width="12"
+   follows="topl|eft"
+   left="10"
+   name="focus_x"
+   top_pad="5"
+   min_val="-1e+007"
+   max_val="1e+007"
+   width="70">
+    <spinner.commit_callback
+     function="CommitSettings" />
+  </spinner>
+
+  <spinner
+   height="20"
+   label="Y"
+   label_width="12"
+   follows="topl|eft"
+   name="focus_y"
+   left_pad="20"
+   min_val="-1e+007"
+   max_val="1e+007"
+   width="70">
+    <spinner.commit_callback
+     function="CommitSettings" />
+  </spinner>
+
+  <spinner
+   height="20"
+   label="Z"
+   label_width="12"
+   follows="topl|eft"
+   name="focus_z"
+   left_pad="20"
+   min_val="-1e+007"
+   max_val="1e+007"
+   width="70">
+    <spinner.commit_callback
+     function="CommitSettings" />
+  </spinner>
+
+  <button
+   follows="left|top"
+   height="23"
+   label="OK"
+   layout="topleft"
+   left="90"
+   name="ok"
+   top_pad="30"
+   width="90">
+    <button.commit_callback
+     function="Ok"/>
+  </button>
+  <button
+   follows="left|top"
+   height="23"
+   label="Cancel"
+   layout="topleft"
+   left_pad="5"
+   name="cancel"
+   width="90">
+    <button.commit_callback
+     function="Cancel"/>
+  </button>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
index 7dee28eff3..a9cda26f0b 100644
--- a/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
@@ -4,7 +4,7 @@
  height="145"
  help_topic="floater_save_preset"
  layout="topleft"
- name="Save Pref Preset"
+ name="save_pref_preset"
  save_rect="true"
  title="SAVE PREF PRESET"
  width="300">
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index d832dac4ff..8d8441695f 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -138,7 +138,7 @@
     width="115">
     <button.commit_callback
      function="Floater.Show"
-     parameter="prefs_move_advanced" />
+     parameter="prefs_view_advanced" />
   </button>  
 
   <button
-- 
cgit v1.2.3


From 98792b9363f81c34c9e3ea773fc544122bea5cc3 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Tue, 30 Jan 2018 10:45:08 -0500
Subject: STORM-2145 Split move and view panels

---
 .../skins/default/xui/en/floater_preferences.xml   |   9 +-
 .../default/xui/en/panel_preferences_move.xml      | 182 --------------------
 .../default/xui/en/panel_preferences_view.xml      | 185 +++++++++++++++++++++
 3 files changed, 193 insertions(+), 183 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/panel_preferences_view.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 7fcc91ffe9..545816c78a 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -87,10 +87,17 @@ https://accounts.secondlife.com/change_email/
         <panel
 		 class="panel_preference_view"
          filename="panel_preferences_move.xml"
-         label="Move &amp; View"
+         label="Move"
          layout="topleft"
          help_topic="preferences_move_tab"
          name="move" />
+        <panel
+		 class="panel_preference_view"
+         filename="panel_preferences_view.xml"
+         label="View"
+         layout="topleft"
+         help_topic="preferences_view_tab"
+         name="view" />
         <panel
 		 class="panel_preference"
          filename="panel_preferences_alerts.xml"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index 8d8441695f..79fbf66139 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -10,188 +10,6 @@
  top="1"
  width="517">
 
-  <icon
-     follows="left|top"
-     height="18"
-     image_name="Cam_FreeCam_Off"
-     layout="topleft"
-     name="camera_icon"
-     mouse_opaque="false"
-     visible="true"
-     width="18"
-     left="30"
-     top="4"/>
-
-  <text
-    follows="top|left|right"
-    height="16"
-    layout="topleft"
-    left="80"
-    top_delta="0"
-    width="100">
-      Preset in use:
-  </text>
-
-  <text
-    follows="top|left|right"
-    height="16"
-    layout="topleft"
-    left_delta="100"
-    name="preset_camera_text"
-    width="120">
-      (None)
-  </text>
-
-  <slider
-   can_edit_text="true"
-   control_name="CameraAngle"
-   decimal_digits="2"
-   follows="left|top"
-   height="16"
-   top_pad="5"
-   increment="0.025"
-   initial_value="1.57"
-   layout="topleft"
-   label_width="100"
-   label="View angle"
-   left="80"
-   max_val="2.97"
-   min_val="0.17"
-   name="camera_fov"
-   show_text="false"
-   width="240" />
-  <slider
-   can_edit_text="true"
-   control_name="CameraOffsetScale"
-   decimal_digits="2"
-   follows="left|top"
-   height="16"
-   increment="0.025"
-   initial_value="1"
-   layout="topleft"
-   label="Distance"
-   left_delta="0"
-   label_width="100"
-   max_val="3"
-   min_val="0.5"
-   name="camera_offset_scale"
-   show_text="false"
-   width="240"
-   top_pad="5"/>
-  <text
-  follows="left|top"
-  type="string"
-  length="1"
-  height="10"
-  left="80"
-  name="heading2"
-  width="200"
-  top_pad="5">
-    Automatic position for:
-  </text>
-
-  <spinner
-   control_name="CameraOpacity"
-   decimal_digits="1"
-   follows="top|left|right"
-   height="24"
-   max_val="1.0"
-   min_val="0.0"
-   increment="0.1"
-   initial_value="1.0"
-   label="Camera controls opacity:"
-   label_width="180"
-   layout="topleft"
-   top_pad="-10"
-   left_pad="10"
-   width="220" />
-
-  <check_box
-     control_name="EditCameraMovement"
-     height="20"
-     follows="left|top"
-     label="Build/Edit"
-     layout="topleft"
-     left="100"
-     name="edit_camera_movement"
-     tool_tip="Use automatic camera positioning when entering and exiting edit mode"
-     width="280"
-     top_pad="-10" />
-  <check_box
-   control_name="AppearanceCameraMovement"
-   follows="left|top"
-   height="16"
-   label="Appearance"
-   layout="topleft"
-   name="appearance_camera_movement"
-   tool_tip="Use automatic camera positioning while in edit mode"
-   width="242" />
-
-  <button
-    follows="top|left"
-    height="23"
-    label="Advanced..."
-    layout="topleft"
-    left_pad="-102"
-    name="PreferencesMoveAdvanced"
-    tool_tip="Adjust camera positioning"
-    width="115">
-    <button.commit_callback
-     function="Floater.Show"
-     parameter="prefs_view_advanced" />
-  </button>  
-
-  <button
-    follows="top|left"
-    height="23"
-    label="Save settings as a preset..."
-    layout="topleft"
-    left="30"
-    name="PrefCameraSaveButton"
-    top_pad="10"
-    width="200">
-    <button.commit_callback
-      function="Pref.PrefSave"
-      parameter="camera" />
-  </button>
-
-  <button
-    follows="top|left"
-    height="23"
-    label="Load preset..."
-    layout="topleft"
-    left_pad="10"
-    name="PrefCameraLoadButton"
-    top_delta="0"
-    width="115">
-    <button.commit_callback
-      function="Pref.PrefLoad"
-	  parameter="camera"/>
-  </button>
-
-  <button
-    follows="top|left"
-    height="23"
-    label="Delete preset..."
-    layout="topleft"
-    left_pad="10"
-    name="PrefCameraDeleteButton"
-    top_delta="0"
-    width="115">
-    <button.commit_callback
-      function="Pref.PrefDelete"
-	  parameter="camera"/>
-  </button>
-
-  <view_border
-    bevel_style="in"
-    follows="left|top|right"
-    height="0"
-    layout="topleft"
-    left="10"
-    top_pad="5"
-    width="500"/>
-
   <icon
    follows="left|top"
    height="18"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_view.xml b/indra/newview/skins/default/xui/en/panel_preferences_view.xml
new file mode 100644
index 0000000000..a7a69eb829
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_preferences_view.xml
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ border="true"
+ follows="left|top|right|bottom"
+ height="418"
+ label="View"
+ layout="topleft"
+ left="102"
+ name="view_panel"
+ top="1"
+ width="517">
+
+  <icon
+     follows="left|top"
+     height="18"
+     image_name="Cam_FreeCam_Off"
+     layout="topleft"
+     name="camera_icon"
+     mouse_opaque="false"
+     visible="true"
+     width="18"
+     left="30"
+     top="4"/>
+
+  <text
+    follows="top|left|right"
+    height="16"
+    layout="topleft"
+    left="80"
+    top_delta="0"
+    width="100">
+      Preset in use:
+  </text>
+
+  <text
+    follows="top|left|right"
+    height="16"
+    layout="topleft"
+    left_delta="100"
+    name="preset_camera_text"
+    width="120">
+      (None)
+  </text>
+
+  <slider
+   can_edit_text="true"
+   control_name="CameraAngle"
+   decimal_digits="2"
+   follows="left|top"
+   height="16"
+   top_pad="5"
+   increment="0.025"
+   initial_value="1.57"
+   layout="topleft"
+   label_width="100"
+   label="View angle"
+   left="80"
+   max_val="2.97"
+   min_val="0.17"
+   name="camera_fov"
+   show_text="false"
+   width="240" />
+  <slider
+   can_edit_text="true"
+   control_name="CameraOffsetScale"
+   decimal_digits="2"
+   follows="left|top"
+   height="16"
+   increment="0.025"
+   initial_value="1"
+   layout="topleft"
+   label="Distance"
+   left_delta="0"
+   label_width="100"
+   max_val="3"
+   min_val="0.5"
+   name="camera_offset_scale"
+   show_text="false"
+   width="240"
+   top_pad="5"/>
+  <text
+  follows="left|top"
+  type="string"
+  length="1"
+  height="10"
+  left="80"
+  name="heading2"
+  width="200"
+  top_pad="5">
+    Automatic position for:
+  </text>
+
+  <spinner
+   control_name="CameraOpacity"
+   decimal_digits="1"
+   follows="top|left|right"
+   height="24"
+   max_val="1.0"
+   min_val="0.0"
+   increment="0.1"
+   initial_value="1.0"
+   label="Camera controls opacity:"
+   label_width="180"
+   layout="topleft"
+   top_pad="-10"
+   left_pad="10"
+   width="220" />
+
+  <check_box
+     control_name="EditCameraMovement"
+     height="20"
+     follows="left|top"
+     label="Build/Edit"
+     layout="topleft"
+     left="100"
+     name="edit_camera_movement"
+     tool_tip="Use automatic camera positioning when entering and exiting edit mode"
+     width="280"
+     top_pad="-10" />
+  <check_box
+   control_name="AppearanceCameraMovement"
+   follows="left|top"
+   height="16"
+   label="Appearance"
+   layout="topleft"
+   name="appearance_camera_movement"
+   tool_tip="Use automatic camera positioning while in edit mode"
+   width="242" />
+
+  <button
+    follows="top|left"
+    height="23"
+    label="Advanced..."
+    layout="topleft"
+    left_pad="-102"
+    name="PreferencesViewAdvanced"
+    tool_tip="Adjust camera positioning"
+    width="115">
+    <button.commit_callback
+     function="Floater.Show"
+     parameter="prefs_view_advanced" />
+  </button>  
+
+  <button
+    follows="top|left"
+    height="23"
+    label="Save settings as a preset..."
+    layout="topleft"
+    left="30"
+    name="PrefCameraSaveButton"
+    top_pad="10"
+    width="200">
+    <button.commit_callback
+      function="Pref.PrefSave"
+      parameter="camera" />
+  </button>
+
+  <button
+    follows="top|left"
+    height="23"
+    label="Load preset..."
+    layout="topleft"
+    left_pad="10"
+    name="PrefCameraLoadButton"
+    top_delta="0"
+    width="115">
+    <button.commit_callback
+      function="Pref.PrefLoad"
+	  parameter="camera"/>
+  </button>
+
+  <button
+    follows="top|left"
+    height="23"
+    label="Delete preset..."
+    layout="topleft"
+    left_pad="10"
+    name="PrefCameraDeleteButton"
+    top_delta="0"
+    width="115">
+    <button.commit_callback
+      function="Pref.PrefDelete"
+	  parameter="camera"/>
+  </button>
+</panel>
-- 
cgit v1.2.3


From c75d443c8359f0bceee2df2adc0a67b2890922ea Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Mon, 4 Nov 2019 20:35:34 +0200
Subject: SL-12186 WIP Updating UI for camera controls, including presets

---
 .../skins/default/xui/en/floater_camera.xml        | 292 +++++++++------------
 .../xui/en/floater_preferences_view_advanced.xml   |  28 +-
 .../default/xui/en/floater_save_pref_preset.xml    |  60 +++--
 .../newview/skins/default/xui/en/notifications.xml |  12 +
 .../default/xui/en/widgets/panel_camera_item.xml   |   4 +-
 5 files changed, 184 insertions(+), 212 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 25db24da2e..933d50acae 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -7,7 +7,7 @@
  legacy_header_height="18"
  can_minimize="true"
  can_close="true"
- height="164"
+ height="135"
  layout="topleft"
  name="camera_floater"
  help_topic="camera_floater"
@@ -16,7 +16,7 @@
  title="CAMERA CONTROLS"
  chrome="true"
  save_rect="true"
- width="228">
+ width="400">
     <floater.string
      name="rotate_tooltip">
         Rotate Camera Around Focus
@@ -33,6 +33,7 @@
      name="free_mode_title">
         View Object
     </floater.string>
+    <string name="inactive_combo_text">Use preset</string>
     <panel
      border="false"
      height="123"
@@ -41,130 +42,18 @@
      top="0"
      mouse_opaque="false"
      name="controls"
-     width="226">
-       <panel
-         follows="all"
-         height="102"
-         layout="topleft"
-         left="8"
-         name="preset_views_list"
-         top="24"
-         width="212"
-         visible="false">
-        <panel_camera_item
-          name="front_view">
-          <panel_camera_item.mousedown_callback
-            function="CameraPresets.ChangeView"
-            parameter="front_view" />
-          <panel_camera_item.picture
-            image_name="Cam_Preset_Front_Off" />
-          <panel_camera_item.selected_picture
-            image_name="Cam_Preset_Front_On" />
-          <panel_camera_item.text
-            name="front_view_text">
-            Front View
-          </panel_camera_item.text>
-        </panel_camera_item>
-        <panel_camera_item
-          name="group_view"
-          top_pad="4">
-          <panel_camera_item.mousedown_callback
-            function="CameraPresets.ChangeView"
-            parameter="group_view" />
-          <panel_camera_item.picture
-            image_name="Cam_Preset_Side_Off" />
-          <panel_camera_item.selected_picture
-            image_name="Cam_Preset_Side_On" />
-          <panel_camera_item.text
-            name="side_view_text">
-            Side View
-          </panel_camera_item.text>
-        </panel_camera_item>
-        <panel_camera_item
-          name="rear_view"
-          layout="topleft"
-          top_pad="4">
-          <panel_camera_item.mousedown_callback
-            function="CameraPresets.ChangeView"
-            parameter="rear_view" />
-          <panel_camera_item.picture
-            image_name="Cam_Preset_Back_Off" />
-          <panel_camera_item.selected_picture
-            image_name="Cam_Preset_Back_On" />
-          <panel_camera_item.text
-            name="rear_view_text">
-            Rear View
-          </panel_camera_item.text>
-        </panel_camera_item>
-      </panel>
-      <panel
-          follows="all"
-          height="68"
-          layout="topleft"
-          left="8"
-          name="camera_modes_list"
-          top="24"
-          width="212"
-          visible="false">
-        <panel_camera_item
-          name="object_view">
-          <panel_camera_item.mousedown_callback
-            function="CameraPresets.ChangeView"
-            parameter="object_view" />
-          <panel_camera_item.text
-            name="object_view_text">
-            Object View
-          </panel_camera_item.text>
-          <panel_camera_item.picture
-            image_name="Object_View_Off" />
-          <panel_camera_item.selected_picture
-            image_name="Object_View_On" />
-        </panel_camera_item>
-        <panel_camera_item
-          name="mouselook_view"
-          layout="topleft">
-          <panel_camera_item.mousedown_callback
-            function="CameraPresets.ChangeView"
-            parameter="mouselook_view" />
-          <panel_camera_item.text
-            name="mouselook_view_text">
-            Mouselook View
-          </panel_camera_item.text>
-          <panel_camera_item.picture
-            image_name="MouseLook_View_Off" />
-          <panel_camera_item.selected_picture
-            image_name="MouseLook_View_On" />
-        </panel_camera_item>
-      </panel>
+     width="220">
          <!--TODO: replace + - images -->
          <panel
             border="false"
             class="camera_zoom_panel"
-            height="114"
+            height="123"
             layout="topleft"
             left="0"
             mouse_opaque="false"
             name="zoom"
             top="0"
-            width="226">
-         <slider
-            can_edit_text="true"
-            control_name="CameraAngle"
-            decimal_digits="2"
-            follows="left|top"
-            height="16"
-            top="20"
-            increment="0.025"
-            initial_value="1.57"
-            layout="topleft"
-            label_width="112"
-            label="View angle"
-            left="10"
-            max_val="1.6"
-            min_val="0.17"
-            name="camera_fov"
-            show_text="false"
-            width="200" />
+            width="220">
            <joystick_rotate
               follows="top|left"
               height="78"
@@ -175,8 +64,8 @@
               sound_flags="3"
               visible="true"
               tool_tip="Orbit camera around focus"
-              top_delta="20"
-              width="78" />                      
+              top="25"
+              width="78" />
            <button
               follows="top|left"
               height="18"
@@ -187,7 +76,7 @@
               left_pad="14" 
               name="zoom_plus_btn"
               width="18"
-              top="38">
+              top="23">
              <commit_callback
                 function="Zoom.plus" />
              <mouse_held_callback
@@ -232,53 +121,128 @@
          scale_image="false"
          sound_flags="3"
          tool_tip="Move camera up and down, left and right"
-         top="40"
+         top="25"
          width="78"/>
+         <text
+          type="string"
+          length="1"
+          follows="left|top"
+          height="15"
+          layout="topleft"
+          left="41"
+          top_pad="9"
+          name="precise_ctrs_label"
+          width="200">
+            Use precise controls
+        </text>
         </panel>
     </panel>
     <panel
-     border="false"
-     height="42"
+     follows="all"
+     height="102"
      layout="topleft"
-     left="2"
-     top_pad="0"
-     name="buttons"
-     width="226">
-        <button
-         name="open_prefs_btn"
-         image_overlay="Icon_Gear_Foreground"
-         tool_tip = "Open view preferences"
-         layout="topleft"
-         left="70"
-         height="23"
-         width="28">
-           <button.commit_callback
-             function="Presets.GoViewPrefs" />
-        </button>
-        <button
-         height="23"
-         label=""
-         layout="topleft"
-         left_pad="1"
-         is_toggle="true"
-         image_overlay="PanOrbit_Off"
-         image_selected="PushButton_Selected_Press"
-         name="pan_btn"
-         tab_stop="false"
-         tool_tip="Orbit Zoom Pan"
-         width="25">
-        </button>
-        <button
-         height="23"
-         label=""
-         layout="topleft"
-         left_pad="1"
-         image_overlay="Cam_FreeCam_Off"
-         image_selected="PushButton_Selected_Press"
-         name="avatarview_btn"
-         tab_stop="false"
-         tool_tip="Camera modes"
-         width="25">
-        </button>
-    </panel>
+     left_pad="2"
+     name="buttons_panel"
+     top="22"
+     width="212">
+    <panel_camera_item
+      name="front_view"
+      tool_tip="Front View"
+      width="30">
+      <panel_camera_item.mousedown_callback
+        function="CameraPresets.ChangeView"
+        parameter="front_view" />
+      <panel_camera_item.picture
+        image_name="Cam_Preset_Front_Off" />
+      <panel_camera_item.selected_picture
+        image_name="Cam_Preset_Front_On" />
+    </panel_camera_item>
+    <panel_camera_item
+      name="group_view"
+      tool_tip="Side View"
+      width="30"
+      left_pad="4">
+      <panel_camera_item.mousedown_callback
+        function="CameraPresets.ChangeView"
+        parameter="group_view" />
+      <panel_camera_item.picture
+        image_name="Cam_Preset_Side_Off" />
+      <panel_camera_item.selected_picture
+        image_name="Cam_Preset_Side_On" />
+    </panel_camera_item>
+    <panel_camera_item
+      name="rear_view"
+      tool_tip="Rear View"
+      width="30"
+      left_pad="4">
+      <panel_camera_item.mousedown_callback
+        function="CameraPresets.ChangeView"
+        tool_tip="Rear View"
+        parameter="rear_view" />
+      <panel_camera_item.picture
+        image_name="Cam_Preset_Back_Off" />
+      <panel_camera_item.selected_picture
+        image_name="Cam_Preset_Back_On" />
+    </panel_camera_item>
+    <panel_camera_item
+        name="object_view"
+        tool_tip="Object View"
+        width="30"
+        left_pad="4">
+        <panel_camera_item.mousedown_callback
+          function="CameraPresets.ChangeView"
+          parameter="object_view" />
+        <panel_camera_item.picture
+          image_name="Object_View_Off" />
+        <panel_camera_item.selected_picture
+          image_name="Object_View_On" />
+      </panel_camera_item>
+      <panel_camera_item
+        name="mouselook_view"
+        tool_tip="Mouselook View"
+        width="30"
+        left_pad="4">
+        <panel_camera_item.mousedown_callback
+          function="CameraPresets.ChangeView"
+          parameter="mouselook_view" />
+        <panel_camera_item.picture
+          image_name="MouseLook_View_Off" />
+        <panel_camera_item.selected_picture
+          image_name="MouseLook_View_On" />
+      </panel_camera_item>
+      <combo_box
+        height="23"
+        left="0"
+        mouse_opaque="true"
+        name="preset_combo"
+        top_pad="10"
+        width="136">
+        <combo_box.item
+         label="Use preset"
+         name="Use preset"
+         value="default" />
+      </combo_box>
+      <icon
+        height="28"
+        width="28"
+        image_name="Command_Preferences_Icon"
+        layout="topleft"
+        mouse_opaque="true"
+        name="icon_gear"
+        tool_tip="My Camera Presets"
+        top_delta="0"
+        left_pad="5" />
+      <button
+        follows="top|left"
+        height="25"
+        label="Save as preset..."
+        layout="topleft"
+        left="0"
+        name="save_preset_btn"
+        top_pad="8"
+        width="150">
+        <button.commit_callback
+          function="CameraPresets.Save"/>
+      </button>
+  </panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml
index 5b2cbee914..3826ead5c2 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- height="170"
+ height="128"
  layout="topleft"
  name="floaterpreferencesviewadvanced"
  help_topic="floaterviewadvanced"
- title="ADJUST CAMERA VIEW"
+ title="CAMERA POSITION"
  save_rect="true"
  width="280">
 
@@ -113,28 +113,4 @@
     <spinner.commit_callback
      function="CommitSettings" />
   </spinner>
-
-  <button
-   follows="left|top"
-   height="23"
-   label="OK"
-   layout="topleft"
-   left="90"
-   name="ok"
-   top_pad="30"
-   width="90">
-    <button.commit_callback
-     function="Ok"/>
-  </button>
-  <button
-   follows="left|top"
-   height="23"
-   label="Cancel"
-   layout="topleft"
-   left_pad="5"
-   name="cancel"
-   width="90">
-    <button.commit_callback
-     function="Cancel"/>
-  </button>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
index a9cda26f0b..178ecad0f3 100644
--- a/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
@@ -1,51 +1,71 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <floater
  legacy_header_height="18"
- height="145"
+ height="185"
  help_topic="floater_save_preset"
  layout="topleft"
  name="save_pref_preset"
  save_rect="true"
  title="SAVE PREF PRESET"
- width="300">
+ width="280">
 
     <string name="title_graphic">Save Graphic Preset</string>
     <string name="title_camera">Save Camera Preset</string>
-
-    <text
-     follows="top|left|right"
-     height="32"
+    <string name="btn_label_save">Save</string>
+    <string name="btn_label_replace">Replace</string>
+    <radio_group
+     height="85"
      layout="topleft"
-     word_wrap="true"
      left="20"
-     name="Preset"
-     top="30"
-     width="200">
-     Type a name for the preset or choose an existing preset.
-    </text>
+     top="15"
+     width="150"
+     name="radio_save_preset">
+     <radio_item
+      label="Save as a new preset"
+      name="new_preset"
+      top="10" 
+      layout="topleft"
+      height="16" 
+      value="0"/>
+     <radio_item
+      label="Replace a preset"
+      name="replace_preset"
+      layout="topleft"
+      top="70" 
+      height="16" 
+      value="1"/>
+    </radio_group> 
+    <line_editor
+     commit_on_focus_lost = "true"
+     follows="top|left"
+     height="23"
+     layout="topleft"
+     left="41"
+     name="preset_txt_editor"
+     width="200"
+     top="45"/>
     <combo_box
      follows="top|left"
      layout="topleft"
-     left="20"
+     left="41"
      name="preset_combo"
-     top_delta="35"
-     allow_text_entry="true"
+     top_pad="35"
      width="200"/>
     <button
      follows="top|left"
-     height="23"
+     height="25"
      label="Save"
      layout="topleft"
      top_delta="40"
-     left="20"
+     left="25"
      name="save"
-     width="70"/>
+     width="110"/>
     <button
      follows="bottom|right"
-     height="23"
+     height="25"
      label="Cancel"
      layout="topleft"
      left_pad="20"
      name="cancel"
-     width="70"/>
+     width="110"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index f72767cceb..7e06389bfe 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -8355,6 +8355,18 @@ Error saving preset [NAME].
 Can not overwrite default preset.
   </notification>
 
+  <notification
+    icon="alertmodal.tga"
+    name="PresetAlreadyExists"
+    type="alertmodal">
+&apos;[NAME]&apos; is in use. You may replace
+this preset or choose another name.
+    <tag>fail</tag>
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
   <notification
     icon="notifytip.tga"
     name="PresetNotDeleted"
diff --git a/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml b/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml
index 98707b8495..564f695cd0 100644
--- a/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml
@@ -15,7 +15,7 @@
      top="30"
      scale_image="true"
      visible="false"
-     width="212" />
+     width="30" />
   <panel_camera_item.icon_selected
    follows="top|left"
      height="30"
@@ -27,7 +27,7 @@
      top="30"
      scale_image="true"
      visible="false"
-     width="212" />
+     width="30" />
   <panel_camera_item.picture
      follows="top|left"
      height="30"
-- 
cgit v1.2.3


From 1c2ab8938bd61097e85ea0ef90ef28c89edbee33 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 8 Nov 2019 16:38:13 +0200
Subject: SL-12186 WIP Revert Preferences changes

---
 .../skins/default/xui/en/floater_preferences.xml   |  11 +-
 .../default/xui/en/panel_preferences_move.xml      |  99 +++++++++--
 .../default/xui/en/panel_preferences_view.xml      | 185 ---------------------
 3 files changed, 89 insertions(+), 206 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/panel_preferences_view.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index d501fe9e36..0e62d50072 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -121,19 +121,12 @@ https://accounts.secondlife.com/change_email/
          help_topic="preferences_chat_tab"
          name="chat" />
         <panel
-		 class="panel_preference_view"
+		 class="panel_preference"
          filename="panel_preferences_move.xml"
-         label="Move"
+         label="Move &amp; View"
          layout="topleft"
          help_topic="preferences_move_tab"
          name="move" />
-        <panel
-		 class="panel_preference_view"
-         filename="panel_preferences_view.xml"
-         label="View"
-         layout="topleft"
-         help_topic="preferences_view_tab"
-         name="view" />
         <panel
 		 class="panel_preference"
          filename="panel_preferences_alerts.xml"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index 79fbf66139..8794e3bf95 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -2,24 +2,100 @@
 <panel
  border="true"
  follows="left|top|right|bottom"
- height="418"
+ height="408"
  label="Move"
  layout="topleft"
  left="102"
  name="move_panel"
  top="1"
  width="517">
-
   <icon
+     follows="left|top"
+     height="18"
+     image_name="Cam_FreeCam_Off"
+     layout="topleft"
+     name="camera_icon"
+     mouse_opaque="false"
+     visible="true"
+     width="18"
+     left="30"
+     top="10"/>
+  <slider
+   can_edit_text="true"
+   control_name="CameraAngle"
+   decimal_digits="2"
+   follows="left|top"
+   height="16"
+   increment="0.025"
+   initial_value="1.57"
+   layout="topleft"
+   label_width="100"
+   label="View angle"
+   left_pad="30"
+   max_val="2.97"
+   min_val="0.17"
+   name="camera_fov"
+   show_text="false"
+   width="240" />
+  <slider
+   can_edit_text="true"
+   control_name="CameraOffsetScale"
+   decimal_digits="2"
+   follows="left|top"
+   height="16"
+   increment="0.025"
+   initial_value="1"
+   layout="topleft"
+   label="Distance"
+   left_delta="0"
+   label_width="100"
+   max_val="3"
+   min_val="0.5"
+   name="camera_offset_scale"
+   show_text="false"
+   width="240"
+   top_pad="5"/>
+  <text
+  follows="left|top"
+  type="string"
+  length="1"
+  height="10"
+  left="80"
+  name="heading2"
+  width="270"
+  top_pad="5">
+    Automatic position for:
+  </text>
+  <check_box
+     control_name="EditCameraMovement"
+     height="20"
+     follows="left|top"
+     label="Build/Edit"
+     layout="topleft"
+     left_delta="30"
+     name="edit_camera_movement"
+     tool_tip="Use automatic camera positioning when entering and exiting edit mode"
+     width="280"
+     top_pad="5" />
+  <check_box
+   control_name="AppearanceCameraMovement"
    follows="left|top"
-   height="18"
-   image_name="Move_Walk_Off"
-   layout="topleft"
-   name="avatar_icon"
-   mouse_opaque="false"
-   visible="true"
-   width="18"
-   top_pad="4"
+   height="16"
+   label="Appearance"
+   layout="topleft"
+   name="appearance_camera_movement"
+   tool_tip="Use automatic camera positioning while in edit mode"
+   width="242" />
+  <icon
+	 follows="left|top"
+	 height="18"
+	 image_name="Move_Walk_Off"
+   layout="topleft"
+	 name="avatar_icon"
+	 mouse_opaque="false"
+	 visible="true"
+	 width="18"
+   top_pad="10"
    left="30" />
   <text
    follows="left|top"
@@ -188,11 +264,10 @@
    label="Other Devices"
    left="30"
    name="joystick_setup_button"
-   top_pad="5"
+   top="30"
    width="155">
     <button.commit_callback
      function="Floater.Show"
      parameter="pref_joystick" />
   </button>
-
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_view.xml b/indra/newview/skins/default/xui/en/panel_preferences_view.xml
deleted file mode 100644
index a7a69eb829..0000000000
--- a/indra/newview/skins/default/xui/en/panel_preferences_view.xml
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- border="true"
- follows="left|top|right|bottom"
- height="418"
- label="View"
- layout="topleft"
- left="102"
- name="view_panel"
- top="1"
- width="517">
-
-  <icon
-     follows="left|top"
-     height="18"
-     image_name="Cam_FreeCam_Off"
-     layout="topleft"
-     name="camera_icon"
-     mouse_opaque="false"
-     visible="true"
-     width="18"
-     left="30"
-     top="4"/>
-
-  <text
-    follows="top|left|right"
-    height="16"
-    layout="topleft"
-    left="80"
-    top_delta="0"
-    width="100">
-      Preset in use:
-  </text>
-
-  <text
-    follows="top|left|right"
-    height="16"
-    layout="topleft"
-    left_delta="100"
-    name="preset_camera_text"
-    width="120">
-      (None)
-  </text>
-
-  <slider
-   can_edit_text="true"
-   control_name="CameraAngle"
-   decimal_digits="2"
-   follows="left|top"
-   height="16"
-   top_pad="5"
-   increment="0.025"
-   initial_value="1.57"
-   layout="topleft"
-   label_width="100"
-   label="View angle"
-   left="80"
-   max_val="2.97"
-   min_val="0.17"
-   name="camera_fov"
-   show_text="false"
-   width="240" />
-  <slider
-   can_edit_text="true"
-   control_name="CameraOffsetScale"
-   decimal_digits="2"
-   follows="left|top"
-   height="16"
-   increment="0.025"
-   initial_value="1"
-   layout="topleft"
-   label="Distance"
-   left_delta="0"
-   label_width="100"
-   max_val="3"
-   min_val="0.5"
-   name="camera_offset_scale"
-   show_text="false"
-   width="240"
-   top_pad="5"/>
-  <text
-  follows="left|top"
-  type="string"
-  length="1"
-  height="10"
-  left="80"
-  name="heading2"
-  width="200"
-  top_pad="5">
-    Automatic position for:
-  </text>
-
-  <spinner
-   control_name="CameraOpacity"
-   decimal_digits="1"
-   follows="top|left|right"
-   height="24"
-   max_val="1.0"
-   min_val="0.0"
-   increment="0.1"
-   initial_value="1.0"
-   label="Camera controls opacity:"
-   label_width="180"
-   layout="topleft"
-   top_pad="-10"
-   left_pad="10"
-   width="220" />
-
-  <check_box
-     control_name="EditCameraMovement"
-     height="20"
-     follows="left|top"
-     label="Build/Edit"
-     layout="topleft"
-     left="100"
-     name="edit_camera_movement"
-     tool_tip="Use automatic camera positioning when entering and exiting edit mode"
-     width="280"
-     top_pad="-10" />
-  <check_box
-   control_name="AppearanceCameraMovement"
-   follows="left|top"
-   height="16"
-   label="Appearance"
-   layout="topleft"
-   name="appearance_camera_movement"
-   tool_tip="Use automatic camera positioning while in edit mode"
-   width="242" />
-
-  <button
-    follows="top|left"
-    height="23"
-    label="Advanced..."
-    layout="topleft"
-    left_pad="-102"
-    name="PreferencesViewAdvanced"
-    tool_tip="Adjust camera positioning"
-    width="115">
-    <button.commit_callback
-     function="Floater.Show"
-     parameter="prefs_view_advanced" />
-  </button>  
-
-  <button
-    follows="top|left"
-    height="23"
-    label="Save settings as a preset..."
-    layout="topleft"
-    left="30"
-    name="PrefCameraSaveButton"
-    top_pad="10"
-    width="200">
-    <button.commit_callback
-      function="Pref.PrefSave"
-      parameter="camera" />
-  </button>
-
-  <button
-    follows="top|left"
-    height="23"
-    label="Load preset..."
-    layout="topleft"
-    left_pad="10"
-    name="PrefCameraLoadButton"
-    top_delta="0"
-    width="115">
-    <button.commit_callback
-      function="Pref.PrefLoad"
-	  parameter="camera"/>
-  </button>
-
-  <button
-    follows="top|left"
-    height="23"
-    label="Delete preset..."
-    layout="topleft"
-    left_pad="10"
-    name="PrefCameraDeleteButton"
-    top_delta="0"
-    width="115">
-    <button.commit_callback
-      function="Pref.PrefDelete"
-	  parameter="camera"/>
-  </button>
-</panel>
-- 
cgit v1.2.3


From bf5ee32838b9d4c53ff1ab709e2935d8d0b4ec0b Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 8 Nov 2019 16:47:11 +0200
Subject: SL-12186 WIP Add new icons

---
 .../skins/default/textures/icons/Presets_Icon.png        | Bin 0 -> 1293 bytes
 indra/newview/skins/default/textures/textures.xml        |   2 ++
 .../newview/skins/default/textures/windows/Icon_Gear.png | Bin 0 -> 6229 bytes
 indra/newview/skins/default/xui/en/panel_status_bar.xml  |  10 +++++-----
 4 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/Presets_Icon.png
 create mode 100644 indra/newview/skins/default/textures/windows/Icon_Gear.png

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/icons/Presets_Icon.png b/indra/newview/skins/default/textures/icons/Presets_Icon.png
new file mode 100644
index 0000000000..503ee892a5
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Presets_Icon.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 40f1d8b88f..b086f7dfa8 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -206,6 +206,7 @@ with the same filename but different name
 
   <texture name="Presets_Icon" file_name="icons/Presets_Icon.png" preload="true" />
 
+  <texture name="Presets_Icon" file_name="icons/Presets_Icon.png" preload="true" />
   <texture name="Presets_Icon_Graphic" file_name="icons/Presets_Icon_Graphic.png" preload="true" />
  <texture name="Favorite_Star_Active" file_name="navbar/Favorite_Star_Active.png" preload="false" />
   <texture name="Favorite_Star_Off" file_name="navbar/Favorite_Star_Off.png" preload="false" />
@@ -256,6 +257,7 @@ with the same filename but different name
   <texture name="Icon_Gear_Background" file_name="windows/Icon_Gear_Background.png" preload="false" />
   <texture name="Icon_Gear_Foreground" file_name="windows/Icon_Gear_Foreground.png" preload="false" />
   <texture name="Icon_Gear_Press" file_name="windows/Icon_Gear_Press.png" preload="false" />
+  <texture name="Icon_Gear" file_name="windows/Icon_Gear.png" preload="false" />
 
   <texture name="Icon_Help_Foreground" file_name="windows/Icon_Help_Foreground.png" preload="true" />
   <texture name="Icon_Help_Press" file_name="windows/Icon_Help_Press.png" preload="true" />
diff --git a/indra/newview/skins/default/textures/windows/Icon_Gear.png b/indra/newview/skins/default/textures/windows/Icon_Gear.png
new file mode 100644
index 0000000000..e1e89b8f32
Binary files /dev/null and b/indra/newview/skins/default/textures/windows/Icon_Gear.png differ
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index ffcfc3ae91..ada980cda1 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -148,19 +148,19 @@
     <icon
      follows="right|top"
      height="16"
-     image_name="Cam_Avatar_Off"
+     image_name="Cam_FreeCam_Off"
      left_pad="8"
      top="2"
      name="presets_icon_camera"
      width="18" />
     <icon
      follows="right|top"
-     height="16"
-     image_name="Presets_Icon_Graphic"
+     height="13"
+     image_name="Presets_Icon"
      left_pad="8"
-     top="2"
+     top="4"
      name="presets_icon_graphic"
-     width="18" />
+     width="16" />
     <button
      follows="right|top"
      height="16"
-- 
cgit v1.2.3


From dd8128114c8cfe812e1dd8f2cfd449a4050d9aea Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 8 Nov 2019 17:31:59 +0200
Subject: SL-12186 WIP Minor updates for 'Camera controls' and 'Save preset'
 floaters

---
 .../xui/en/floater_preferences_view_advanced.xml        | 12 ++++++------
 .../skins/default/xui/en/floater_save_pref_preset.xml   | 17 +++++++++--------
 2 files changed, 15 insertions(+), 14 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml
index 3826ead5c2..77e36f0b09 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml
@@ -22,7 +22,7 @@
    height="20"
    label="X"
    label_width="12"
-   follows="topl|eft"
+   follows="top|left"
    left="10"
    name="camera_x"
    top_pad="5"
@@ -37,7 +37,7 @@
    height="20"
    label="Y"
    label_width="12"
-   follows="topl|eft"
+   follows="top|left"
    name="camera_y"
    left_pad="20"
    min_val="-1e+007"
@@ -51,7 +51,7 @@
    height="20"
    label="Z"
    label_width="12"
-   follows="topl|eft"
+   follows="top|left"
    name="camera_z"
    left_pad="20"
    min_val="-1e+007"
@@ -75,7 +75,7 @@
    height="20"
    label="X"
    label_width="12"
-   follows="topl|eft"
+   follows="top|left"
    left="10"
    name="focus_x"
    top_pad="5"
@@ -90,7 +90,7 @@
    height="20"
    label="Y"
    label_width="12"
-   follows="topl|eft"
+   follows="top|left"
    name="focus_y"
    left_pad="20"
    min_val="-1e+007"
@@ -104,7 +104,7 @@
    height="20"
    label="Z"
    label_width="12"
-   follows="topl|eft"
+   follows="top|left"
    name="focus_z"
    left_pad="20"
    min_val="-1e+007"
diff --git a/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
index 178ecad0f3..3a5838e846 100644
--- a/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
@@ -44,19 +44,12 @@
      name="preset_txt_editor"
      width="200"
      top="45"/>
-    <combo_box
-     follows="top|left"
-     layout="topleft"
-     left="41"
-     name="preset_combo"
-     top_pad="35"
-     width="200"/>
     <button
      follows="top|left"
      height="25"
      label="Save"
      layout="topleft"
-     top_delta="40"
+     top="145"
      left="25"
      name="save"
      width="110"/>
@@ -68,4 +61,12 @@
      left_pad="20"
      name="cancel"
      width="110"/>
+<!-- *HACK to correctly draw drop-down list over the buttons-->
+    <combo_box
+     follows="top|left"
+     layout="topleft"
+     left="41"
+     name="preset_combo"
+     top_delta="-40"
+     width="200"/>
 </floater>
-- 
cgit v1.2.3


From 1fa0b3fe954ead1a136d3c38b63db05b5f2f657e Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 8 Nov 2019 17:57:17 +0200
Subject: SL-12186 WIP Add new 'My camera presets' floater

---
 .../skins/default/xui/en/floater_camera.xml        | 22 +++++----
 .../default/xui/en/floater_camera_presets.xml      | 23 +++++++++
 .../default/xui/en/panel_camera_preset_item.xml    | 56 ++++++++++++++++++++++
 3 files changed, 93 insertions(+), 8 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_camera_presets.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_camera_preset_item.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 933d50acae..9408e68c2d 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -222,16 +222,22 @@
          name="Use preset"
          value="default" />
       </combo_box>
-      <icon
-        height="28"
-        width="28"
-        image_name="Command_Preferences_Icon"
+      <button
+        height="16"
+        width="16"  
         layout="topleft"
         mouse_opaque="true"
-        name="icon_gear"
+        name="gear_btn"
         tool_tip="My Camera Presets"
-        top_delta="0"
-        left_pad="5" />
+        top_delta="3"
+        left_pad="10" 
+        image_selected="Icon_Gear"
+        image_pressed="Icon_Gear"
+        image_unselected="Icon_Gear"
+        is_toggle="true">
+        <button.commit_callback
+          function="CameraPresets.ShowPresetsList"/>
+      </button>
       <button
         follows="top|left"
         height="25"
@@ -239,7 +245,7 @@
         layout="topleft"
         left="0"
         name="save_preset_btn"
-        top_pad="8"
+        top_pad="18"
         width="150">
         <button.commit_callback
           function="CameraPresets.Save"/>
diff --git a/indra/newview/skins/default/xui/en/floater_camera_presets.xml b/indra/newview/skins/default/xui/en/floater_camera_presets.xml
new file mode 100644
index 0000000000..0d9a6bb16a
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_camera_presets.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_resize="true"
+ height="200"
+ min_height="150"
+ title="MY CAMERA PRESETS"
+ layout="topleft"
+ name="floater_camera_presets"
+ single_instance="true"
+ min_width="185"
+ width="250">
+  <flat_list_view
+    allow_select="true"
+    follows="all"
+    height="165"
+    layout="topleft"
+    left="3"
+    multi_select="false"
+    name="preset_list"
+    top="20"
+    width="245" />
+  </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_camera_preset_item.xml b/indra/newview/skins/default/xui/en/panel_camera_preset_item.xml
new file mode 100644
index 0000000000..187f5889eb
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_camera_preset_item.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ follows="top|right|left"
+ height="20"
+ layout="topleft"
+ left="0"
+ name="camera_preset_item"
+ top="0"
+ width="280">
+    <text
+     follows="left"
+     height="20"
+     layout="topleft"
+     left="10"
+     parse_urls="false"
+     use_ellipses="true"
+     name="preset_name"
+     text_color="White"
+     top="2"
+     value="Default"
+     width="159" />
+    <button
+     follows="right"
+     image_selected="TrashItem_Off"
+     image_pressed="TrashItem_Off"
+     image_unselected="TrashItem_Off"
+     is_toggle="true"
+     layout="topleft"
+     left_pad="5"
+     right="-10"
+     name="delete_btn"
+     tool_tip="Delete preset"
+     top="3"
+     height="18"
+     width="18" >
+      <button.commit_callback
+        function="CameraPresets.Delete"/>
+    </button>
+  <button
+   follows="right"
+   image_selected="Refresh_Off"
+   image_pressed="Refresh_Off"
+   image_unselected="Refresh_Off"
+   is_toggle="true"
+   layout="topleft"
+   left_pad="5"
+   right="-10"
+   name="reset_btn"
+   tool_tip="Reset preset to default"
+   top="2"
+   height="20"
+   width="20" >
+    <button.commit_callback
+      function="CameraPresets.Reset"/>
+  </button>
+</panel>
-- 
cgit v1.2.3


From 382c1845012cc4e2be78a5a03334b4157a732349 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Tue, 12 Nov 2019 16:26:34 +0200
Subject: SL-12186 WIP Added ability to reset default presets and updated item
 list in 'My camera presets' floater

---
 .../default/xui/en/panel_camera_preset_item.xml      | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_camera_preset_item.xml b/indra/newview/skins/default/xui/en/panel_camera_preset_item.xml
index 187f5889eb..9417ab4ac2 100644
--- a/indra/newview/skins/default/xui/en/panel_camera_preset_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_camera_preset_item.xml
@@ -7,6 +7,26 @@
  name="camera_preset_item"
  top="0"
  width="280">
+    <icon
+     follows="top|right|left"
+     height="20"
+     image_name="ListItem_Over"
+     layout="topleft"
+     left="0"
+     name="hovered_icon"
+     top="0"
+     visible="false"
+     width="380" />
+    <icon
+     height="20"
+     follows="top|right|left"
+     image_name="ListItem_Select"
+     layout="topleft"
+     left="0"
+     name="selected_icon"
+     top="0"
+     visible="false"
+     width="380" />
     <text
      follows="left"
      height="20"
-- 
cgit v1.2.3


From 4778417f25f070e9019e975c979d93fb8881b5ac Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Wed, 13 Nov 2019 15:55:02 +0200
Subject: SL-12186 WIP Use appropriate offset names when saving presets

---
 .../newview/skins/default/xui/en/panel_presets_camera_pulldown.xml  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_presets_camera_pulldown.xml b/indra/newview/skins/default/xui/en/panel_presets_camera_pulldown.xml
index dc37270751..25d9c47449 100644
--- a/indra/newview/skins/default/xui/en/panel_presets_camera_pulldown.xml
+++ b/indra/newview/skins/default/xui/en/panel_presets_camera_pulldown.xml
@@ -57,13 +57,13 @@
     width="215" />
   <button
     name="open_prefs_btn"
-    label="Open View Preferences"
-    tool_tip = "Bring up view preferences"
+    label="Open Camera floater"
+    tool_tip = "Bring up Camera floater"
     top_delta="5"
     left="15"
     height="20"
     width="200">
     <button.commit_callback
-      function="Presets.GoViewPrefs" />
+      function="Presets.toggleCameraFloater" />
   </button>
 </panel>
-- 
cgit v1.2.3


From 26732bc576f86fde532e1f9448bd127515f70612 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Thu, 14 Nov 2019 23:43:52 +0200
Subject: Line endings fix

---
 .../default/xui/en/floater_camera_presets.xml      | 46 +++++++++++-----------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_camera_presets.xml b/indra/newview/skins/default/xui/en/floater_camera_presets.xml
index 0d9a6bb16a..930357f568 100644
--- a/indra/newview/skins/default/xui/en/floater_camera_presets.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera_presets.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- can_resize="true"
- height="200"
- min_height="150"
- title="MY CAMERA PRESETS"
- layout="topleft"
- name="floater_camera_presets"
- single_instance="true"
- min_width="185"
- width="250">
-  <flat_list_view
-    allow_select="true"
-    follows="all"
-    height="165"
-    layout="topleft"
-    left="3"
-    multi_select="false"
-    name="preset_list"
-    top="20"
-    width="245" />
-  </floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_resize="true"
+ height="200"
+ min_height="150"
+ title="MY CAMERA PRESETS"
+ layout="topleft"
+ name="floater_camera_presets"
+ single_instance="true"
+ min_width="185"
+ width="250">
+  <flat_list_view
+    allow_select="true"
+    follows="all"
+    height="165"
+    layout="topleft"
+    left="3"
+    multi_select="false"
+    name="preset_list"
+    top="20"
+    width="245" />
+  </floater>
-- 
cgit v1.2.3


From f4d4fb2ad0927ebb8545bac1abd1b74918a006f5 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 22 Nov 2019 14:34:20 +0200
Subject: SL-12288 Enhancement for Rotate and Track camera controls

---
 .../default/textures/bottomtray/Cam_Rotate_Center.png   | Bin 0 -> 10689 bytes
 .../default/textures/bottomtray/Cam_Tracking_Center.png | Bin 0 -> 1714 bytes
 indra/newview/skins/default/textures/textures.xml       |   2 ++
 3 files changed, 2 insertions(+)
 create mode 100644 indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Center.png
 create mode 100644 indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Center.png

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Center.png b/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Center.png
new file mode 100644
index 0000000000..ffc3c85ea2
Binary files /dev/null and b/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Center.png differ
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Center.png b/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Center.png
new file mode 100644
index 0000000000..2812d614e6
Binary files /dev/null and b/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Center.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index b086f7dfa8..2a4171f11b 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -113,8 +113,10 @@ with the same filename but different name
 
   <texture name="Cam_Rotate_In" file_name="bottomtray/Cam_Rotate_In.png" preload="false" />
   <texture name="Cam_Rotate_Out" file_name="bottomtray/Cam_Rotate_Out.png" preload="false" />
+  <texture name="Cam_Rotate_Center" file_name="bottomtray/Cam_Rotate_Center.png" preload="false" />
   <texture name="Cam_Tracking_In" file_name="bottomtray/Cam_Tracking_In.png" preload="false" />
   <texture name="Cam_Tracking_Out" file_name="bottomtray/Cam_Tracking_Out.png" preload="false" />
+  <texture name="Cam_Tracking_Center" file_name="bottomtray/Cam_Tracking_Center.png" preload="false" />
 
   <texture name="Checkbox_Off_Disabled" file_name="widgets/Checkbox_Disabled.png" preload="true" />
   <texture name="Checkbox_On_Disabled" file_name="widgets/Checkbox_On_Disabled.png" preload="true" />
-- 
cgit v1.2.3


From 8d94e2af12aaf3cdb170a0b36e9ae36e91a2365d Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Tue, 26 Nov 2019 17:36:14 +0200
Subject: SL-12186 Update camera controls if preset was selected from the
 pulldown menu

---
 indra/newview/skins/default/xui/en/floater_camera.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 9408e68c2d..60461c5743 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -151,7 +151,7 @@
       width="30">
       <panel_camera_item.mousedown_callback
         function="CameraPresets.ChangeView"
-        parameter="front_view" />
+        parameter="Front View" />
       <panel_camera_item.picture
         image_name="Cam_Preset_Front_Off" />
       <panel_camera_item.selected_picture
@@ -164,7 +164,7 @@
       left_pad="4">
       <panel_camera_item.mousedown_callback
         function="CameraPresets.ChangeView"
-        parameter="group_view" />
+        parameter="Side View" />
       <panel_camera_item.picture
         image_name="Cam_Preset_Side_Off" />
       <panel_camera_item.selected_picture
@@ -178,7 +178,7 @@
       <panel_camera_item.mousedown_callback
         function="CameraPresets.ChangeView"
         tool_tip="Rear View"
-        parameter="rear_view" />
+        parameter="Rear View" />
       <panel_camera_item.picture
         image_name="Cam_Preset_Back_Off" />
       <panel_camera_item.selected_picture
-- 
cgit v1.2.3


From a2f0fd64e947f96305200edbdfd496529cadb90e Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 8 Jan 2020 18:14:21 +0200
Subject: SL-12510 Revert changes and separate 'Save Graphic Preset' floater

---
 .../default/xui/en/floater_save_camera_preset.xml  | 70 +++++++++++++++++++++
 .../default/xui/en/floater_save_pref_preset.xml    | 72 ++++++++--------------
 2 files changed, 94 insertions(+), 48 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_save_camera_preset.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_save_camera_preset.xml b/indra/newview/skins/default/xui/en/floater_save_camera_preset.xml
new file mode 100644
index 0000000000..54fdb6d167
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_save_camera_preset.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<floater
+ legacy_header_height="18"
+ height="185"
+ help_topic="floater_save_preset"
+ layout="topleft"
+ name="save_camera_preset"
+ save_rect="true"
+ title="Save Camera Preset"
+ width="280">
+
+    <string name="btn_label_save">Save</string>
+    <string name="btn_label_replace">Replace</string>
+    <radio_group
+     height="85"
+     layout="topleft"
+     left="20"
+     top="15"
+     width="150"
+     name="radio_save_preset">
+     <radio_item
+      label="Save as a new preset"
+      name="new_preset"
+      top="10" 
+      layout="topleft"
+      height="16" 
+      value="0"/>
+     <radio_item
+      label="Replace a preset"
+      name="replace_preset"
+      layout="topleft"
+      top="70" 
+      height="16" 
+      value="1"/>
+    </radio_group> 
+    <line_editor
+     commit_on_focus_lost = "true"
+     follows="top|left"
+     height="23"
+     layout="topleft"
+     left="41"
+     name="preset_txt_editor"
+     width="200"
+     top="45"/>
+    <button
+     follows="top|left"
+     height="25"
+     label="Save"
+     layout="topleft"
+     top="145"
+     left="25"
+     name="save"
+     width="110"/>
+    <button
+     follows="bottom|right"
+     height="25"
+     label="Cancel"
+     layout="topleft"
+     left_pad="20"
+     name="cancel"
+     width="110"/>
+<!-- *HACK to correctly draw drop-down list over the buttons-->
+    <combo_box
+     follows="top|left"
+     layout="topleft"
+     left="41"
+     name="preset_combo"
+     top_delta="-40"
+     width="200"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
index 3a5838e846..62260274f5 100644
--- a/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
@@ -1,72 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <floater
  legacy_header_height="18"
- height="185"
+ height="145"
  help_topic="floater_save_preset"
  layout="topleft"
  name="save_pref_preset"
  save_rect="true"
- title="SAVE PREF PRESET"
- width="280">
+ title="Save Graphic Preset"
+ width="300">
 
-    <string name="title_graphic">Save Graphic Preset</string>
-    <string name="title_camera">Save Camera Preset</string>
-    <string name="btn_label_save">Save</string>
-    <string name="btn_label_replace">Replace</string>
-    <radio_group
-     height="85"
+    <text
+     follows="top|left|right"
+     height="32"
      layout="topleft"
+     word_wrap="true"
      left="20"
-     top="15"
-     width="150"
-     name="radio_save_preset">
-     <radio_item
-      label="Save as a new preset"
-      name="new_preset"
-      top="10" 
-      layout="topleft"
-      height="16" 
-      value="0"/>
-     <radio_item
-      label="Replace a preset"
-      name="replace_preset"
-      layout="topleft"
-      top="70" 
-      height="16" 
-      value="1"/>
-    </radio_group> 
-    <line_editor
-     commit_on_focus_lost = "true"
+     name="Preset"
+     top="30"
+     width="200">
+     Type a name for the preset or choose an existing preset.
+    </text>
+    <combo_box
      follows="top|left"
-     height="23"
      layout="topleft"
-     left="41"
-     name="preset_txt_editor"
-     width="200"
-     top="45"/>
+     left="20"
+     name="preset_combo"
+     top_delta="35"
+     allow_text_entry="true"
+     width="200"/>
     <button
      follows="top|left"
-     height="25"
+     height="23"
      label="Save"
      layout="topleft"
-     top="145"
-     left="25"
+     top_delta="40"
+     left="20"
      name="save"
-     width="110"/>
+     width="70"/>
     <button
      follows="bottom|right"
-     height="25"
+     height="23"
      label="Cancel"
      layout="topleft"
      left_pad="20"
      name="cancel"
-     width="110"/>
-<!-- *HACK to correctly draw drop-down list over the buttons-->
-    <combo_box
-     follows="top|left"
-     layout="topleft"
-     left="41"
-     name="preset_combo"
-     top_delta="-40"
-     width="200"/>
+     width="70"/>
 </floater>
-- 
cgit v1.2.3


From a5c1ae9fafa3b1415eb75aefc9c8ace19e8940d5 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Mon, 10 Feb 2020 16:43:21 +0200
Subject: SL-12621 Add CameraOffsetScale option to "Precise Controls" floater

---
 .../xui/en/floater_preferences_view_advanced.xml   | 43 +++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml
index 77e36f0b09..6aedde84a0 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- height="128"
+ height="190"
  layout="topleft"
  name="floaterpreferencesviewadvanced"
  help_topic="floaterviewadvanced"
@@ -10,6 +10,7 @@
 
   <text
     follows="top|left|right"
+    name="camera_offset_lbl"
     height="16"
     layout="topleft"
     left="10"
@@ -63,6 +64,7 @@
 
   <text
     follows="top|left|right"
+    name="focus_offset_lbl"
     height="16"
     layout="topleft"
     left="10"
@@ -113,4 +115,43 @@
     <spinner.commit_callback
      function="CommitSettings" />
   </spinner>
+
+   <text
+    follows="top|left|right"
+    name="offset_scale_lbl"
+    height="16"
+    layout="topleft"
+    left="10"
+    top_pad="20"
+    width="140">
+      Camera offset scale:
+  </text>
+
+  <slider
+   control_name="CameraOffsetScale"
+   follows="top|left|right"
+   height="16"
+   top_pad="5"
+   increment="0.1"
+   min_val="-3"
+   max_val="5"
+   show_text="false"
+   layout="topleft"
+   left="3"
+   name="offset_scale_sld"
+   tool_tip="Choose name tag opacity"
+   width="196" />
+  <spinner
+   control_name="CameraOffsetScale"
+   height="20"
+   follows="top|left|right"
+   left_pad="5"
+   name="offset_scale_ctrl"
+   min_val="-3"
+   max_val="5"
+   width="58">
+    <spinner.commit_callback
+     function="CommitSettings" />
+  </spinner>
+
 </floater>
-- 
cgit v1.2.3


From 95992bd1a2c14fd88b18c73a068989bd4235bd55 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Tue, 11 Feb 2020 14:25:53 +0200
Subject: SL-12621 Remove inappropriate tooltip

---
 indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml
index 6aedde84a0..4c3c7e4930 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml
@@ -139,7 +139,6 @@
    layout="topleft"
    left="3"
    name="offset_scale_sld"
-   tool_tip="Choose name tag opacity"
    width="196" />
   <spinner
    control_name="CameraOffsetScale"
-- 
cgit v1.2.3


From 3e403ffb4f6d295b11c9842bed53df5d15848f0b Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Mon, 16 Mar 2020 17:48:23 +0200
Subject: SL-4495 Add setting to ignore Hover height when setting Camera
 position

---
 .../default/xui/en/floater_edit_hover_height.xml      | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_edit_hover_height.xml b/indra/newview/skins/default/xui/en/floater_edit_hover_height.xml
index 52084e5f8e..3570456b44 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_hover_height.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_hover_height.xml
@@ -4,18 +4,16 @@
  legacy_header_height="225"
  can_minimize="true"
  can_close="true"
- can_resize="true"
- min_height="65"
- min_width="515"
- height="65"
+ can_resize="false"
+ height="80"
+ width="515"
  layout="topleft"
  name="HoverHeight"
  single_instance="true"
  help_topic="hover_height"
  save_rect="true"
  save_visibility="true"
- title="SET HOVER HEIGHT"
- width="515">
+ title="SET HOVER HEIGHT">
       <slider
      enabled="false"
      control_name="HoverHeightSlider"
@@ -34,4 +32,13 @@
      can_edit_text="true"
      >
     </slider>
+  <check_box
+     control_name="HoverHeightAffectsCamera"
+     follows="all"
+     height="15"
+     label="Bind Camera view"
+     layout="topleft"
+     name="BindCameraCheck"
+     top_pad="7"
+     width="237"/>
 </floater>
-- 
cgit v1.2.3


From 1ec8c7a68adb10c78e1cc31182b797d6a2ae386f Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 10 Apr 2020 17:06:14 +0300
Subject: SL-12999 List can go out of floater's rect, so it should consume
 scroll events

---
 indra/newview/skins/default/xui/en/floater_camera.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 60461c5743..9deb38e3af 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -217,6 +217,8 @@
         name="preset_combo"
         top_pad="10"
         width="136">
+        <combo_list
+        mouse_wheel_opaque="true"/>
         <combo_box.item
          label="Use preset"
          name="Use preset"
-- 
cgit v1.2.3