Merge branch 'main' into 2024.12-ForeverFPS

5 files changed, 135 insertions, 83 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 44a5638bc4..4f45625828 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -8,7 +8,7 @@
  can_minimize="false"
  can_collapse="false"
  can_close="true"
- width="410"
+ width="370"
  height="114"
  layout="topleft"
  name="camera_floater"
@@ -37,29 +37,28 @@
     <string name="inactive_combo_text">Use preset</string>
     <panel
      border="false"
-     width="220"
-     height="90"
+     width="168"
+     height="96"
      layout="topleft"
      left="2"
      top="18"
      mouse_opaque="false"
      name="controls"
-     >
-         <!--TODO: replace + - images -->
+    >
          <panel
             border="false"
             class="camera_zoom_panel"
-            height="90"
+            height="76"
             layout="topleft"
             left="0"
             mouse_opaque="false"
             name="zoom"
             top="0"
-            width="220">
+            width="168">
            <joystick_rotate
               follows="top|left"
-              width="78"
-              height="78"
+              width="60"
+              height="60"
               layout="topleft"
               left="7"
               top="8"
@@ -70,72 +69,26 @@
               scale_image="true"
               tool_tip="Orbit camera around focus"
               />
-           <button
+              <joystick_track
               follows="top|left"
-              width="18"
-              height="18"
+              width="60"
+              height="60"
               left_pad="4"
-              top="2"
-              layout="topleft"
-              image_disabled="AddItem_Disabled"
-              image_selected="AddItem_Press"
-              image_unselected="AddItem_Off"
-              name="zoom_plus_btn"
-              >
-             <commit_callback
-                function="Zoom.plus" />
-             <mouse_held_callback
-                function="Zoom.plus" />
-           </button>
-           <slider_bar
-              width="18"
-              height="50"
-              top_pad="0"
-              layout="topleft"
-              name="zoom_slider"
-              orientation="vertical"
-              tool_tip="Zoom camera toward focus"
-              min_val="0"
-              max_val="1"
-              >
-             <commit_callback function="Slider.value_changed"/>
-           </slider_bar>
-           <button
-              follows="top|left"
-              width="18"
-              height="18"
-              top_pad="0"
+              image_selected="Cam_Tracking_In"
+              image_unselected="Cam_Tracking_Out"
               layout="topleft"
-              image_disabled="MinusItem_Disabled"
-              image_selected="MinusItem_Press"
-              image_unselected="MinusItem_Off"
-              name="zoom_minus_btn"
-              >
-             <commit_callback
-                function="Zoom.minus" />
-             <mouse_held_callback
-                function="Zoom.minus" />
-           </button>
-         <joystick_track
-         follows="top|left"
-         width="78"
-         height="78"
-         left_pad="4"
-         image_selected="Cam_Tracking_In"
-         image_unselected="Cam_Tracking_Out"
-         layout="topleft"
-         name="cam_track_stick"
-         quadrant="left"
-         scale_image="true"
-         sound_flags="3"
-         tool_tip="Move camera up and down, left and right"
-         />
+              name="cam_track_stick"
+              quadrant="left"
+              scale_image="true"
+              sound_flags="3"
+              tool_tip="Move camera up and down, left and right"
+              />
         <button
           follows="top|left"
           width="18"
           height="18"
           top="8"
-          left_pad="6"
+          left_pad="8"
           layout="topleft"
           name="collapse_btn"
           >
@@ -154,10 +107,67 @@
           >
         </button>
         </panel>
+        <panel
+            border="false"
+            class="camera_zoom_panel"
+            height="18"
+            layout="topleft"
+            left="0"
+            mouse_opaque="false"
+            name="zoom"
+            top_pad="0"
+            width="150">
+          <button
+              follows="top|left"
+              width="18"
+              height="18"
+              left="2"
+              top="0"
+              layout="topleft"
+              image_disabled="MinusItem_Disabled"
+              image_selected="MinusItem_Press"
+              image_unselected="MinusItem_Off"
+              name="zoom_minus_btn"
+              >
+             <commit_callback
+                function="Zoom.minus" />
+             <mouse_held_callback
+                function="Zoom.minus" />
+           </button>
+           <slider_bar
+              width="100"
+              height="18"
+              left_pad="2"
+              layout="topleft"
+              name="zoom_slider"
+              orientation="horizontal"
+              tool_tip="Zoom camera toward focus"
+              min_val="0"
+              max_val="1"
+              >
+             <commit_callback function="Slider.value_changed"/>
+           </slider_bar>
+           <button
+              follows="bottom|left"
+              width="18"
+              height="18"
+              left_pad="2"
+              layout="topleft"
+              image_disabled="AddItem_Disabled"
+              image_selected="AddItem_Press"
+              image_unselected="AddItem_Off"
+              name="zoom_plus_btn"
+              >
+             <commit_callback
+                function="Zoom.plus" />
+             <mouse_held_callback
+                function="Zoom.plus" />
+           </button>
+        </panel>
     </panel>
     <panel
      follows="left|top"
-     height="90"
+     height="110"
      layout="topleft"
      left_pad="2"
      right="-2"
diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
index 78d13293a8..9db5502387 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -29,13 +29,13 @@
     decimal_digits="0"
     follows="left|top"
     height="16"
-    increment="8"
+    increment="32"
     initial_value="160"
     label="Draw distance:"
     label_width="185"
     layout="topleft"
     left="30"
-    min_val="64"
+    min_val="32"
     max_val="512"
     name="DrawDistance"
     top_delta="16"
@@ -52,7 +52,7 @@
     left_delta="330"
     width="20">
      m
-  </text> 
+  </text>
   <slider
     control_name="RenderMaxPartCount"
     decimal_digits="0"
@@ -626,9 +626,9 @@
       layout="topleft"
       left="385"
       name="vert_border"
-      top="16"      
+      top="16"
       width="0"/>
-  
+
   <text
     type="string"
     length="1"
@@ -732,7 +732,7 @@
         <check_box.commit_callback
           function="Pref.RenderOptionUpdate" />
     </check_box>
-    
+
   <text
     type="string"
     length="1"
@@ -751,7 +751,7 @@
    height="18"
    layout="topleft"
    left_delta="130"
-   top_delta="0" 
+   top_delta="0"
    name="ShadowDetail"
    width="150">
      <combo_box.item
@@ -781,7 +781,7 @@
     <check_box.commit_callback
       function="Pref.RenderOptionUpdate" />
   </check_box>
-  
+
   <text
     type="string"
     length="1"
diff --git a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
index 7ba7b1d579..c1260f3b4a 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
@@ -209,11 +209,11 @@
     follows="left|top"
     top_delta="-1"
     height="16"
-    increment="8"
-    initial_value="160"
+    increment="16"
+    initial_value="128"
     label_width="90"
     layout="topleft"
-    min_val="64"
+    min_val="32"
     max_val="512"
     name="draw_distance"
     left_pad="5"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
index 44df5354aa..b6fdef3475 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
@@ -390,4 +390,46 @@
    show_text="true"
    top_pad="5"
    width="415" />
+
+<text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="15"
+    layout="topleft"
+    left="30"
+    name="skin_selection_label"
+    top_pad="10"
+    width="400">
+       Skin
+   </text>
+   <radio_group
+     control_name="skin_selection"
+     height="20"
+     layout="topleft"
+     left="35"
+     top_pad="0"
+     name="skin_selection">
+        <radio_item
+         label="default"
+         name="radio"
+         top_delta="20"
+         layout="topleft"
+         height="16"
+         left="0"
+         value="default"
+         width="75" />
+        <radio_item
+         label="contrast"
+         left_pad="0"
+         layout="topleft"
+         top_delta="0"
+         height="16"
+         name="radio2"
+         value="contrast"
+         width="75" />
+        <radio_group.commit_callback
+            function="Pref.SelectSkin" />
+    </radio_group>
+
 </panel>
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 7481e10ed2..fa692d7200 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -39,7 +39,7 @@
     layout="topleft"
     left="10"
     name="QualitySpeed"
-    top_delta="35" 
+    top_delta="35"
     width="400">
       Quality &amp; speed:
   </text>
@@ -207,13 +207,13 @@
     decimal_digits="0"
     follows="left|top"
     height="16"
-    increment="8"
+    increment="32"
     initial_value="160"
     label="Draw distance:"
     label_width="187"
     layout="topleft"
     left="30"
-    min_val="64"
+    min_val="32"
     max_val="512"
     name="DrawDistance"
     top_delta="40"
@@ -311,7 +311,7 @@
          name="2"
          value="2"/>
     </combo_box>
-  
+
   <slider
     control_name="IndirectMaxComplexity"
     tool_tip="Controls at what point a visually complex avatar is drawn as a JellyDoll"