From 00ce291f013ce434b202da675bfb38431014a077 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Tue, 17 Oct 2017 12:03:26 -0700
Subject: New prototype control for moving sun and moon in sky.

---
 indra/newview/skins/default/xui/en/widgets/joystick_quat.xml   | 7 +++++++
 indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/widgets/joystick_quat.xml

(limited to 'indra/newview/skins/default/xui/en/widgets')

diff --git a/indra/newview/skins/default/xui/en/widgets/joystick_quat.xml b/indra/newview/skins/default/xui/en/widgets/joystick_quat.xml
new file mode 100644
index 0000000000..a190da3909
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/joystick_quat.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<joystick_rotate
+   image_selected="Cam_Rotate_In"
+   image_unselected="Cam_Rotate_Out"
+   scale_image="false"
+   mouse_opaque="false"
+   held_down_delay.seconds="0"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml b/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml
index a190da3909..cbf721b346 100644
--- a/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml
+++ b/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<joystick_rotate
+<joystick_quat
    image_selected="Cam_Rotate_In"
    image_unselected="Cam_Rotate_Out"
-   scale_image="false"
+   scale_image="true"
    mouse_opaque="false"
    held_down_delay.seconds="0"/>
-- 
cgit v1.2.3


From 8b3957b310afa23e543c3eb33aca9131dba52b31 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Thu, 7 Jun 2018 20:22:20 +0300
Subject: MAINT-8331 EEP UI control: XYVector

---
 .../skins/default/xui/en/widgets/xy_vector.xml     | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/widgets/xy_vector.xml

(limited to 'indra/newview/skins/default/xui/en/widgets')

diff --git a/indra/newview/skins/default/xui/en/widgets/xy_vector.xml b/indra/newview/skins/default/xui/en/widgets/xy_vector.xml
new file mode 100644
index 0000000000..93ae26a6ad
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/xy_vector.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<xy_vector
+    name="xyvector"
+    width="120"
+    height="140"
+    decimal_digits="1"
+    label_width="16"
+    padding="4"
+    edit_bar_height="18"
+    user_resize="false">
+    
+    <xy_vector.border
+        visible="true"/>
+
+    <xy_vector.x_entry
+        name="XEntry"
+        tab_stop="true"
+        label="X:"/>
+    <xy_vector.y_entry
+        name="YEntry"
+        tab_stop="true"
+        label="Y:"/>
+    
+    <xy_vector.touch_area
+        name="TouchArea"
+        bevel_style="in"
+        border_visible="true"/>
+
+</xy_vector>
-- 
cgit v1.2.3


From 1abea33b7012b6b00502620dab92cc39eacb1d50 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Wed, 18 Jul 2018 14:13:29 +0300
Subject: MAINT-8334 EEP UI control: Virtual Trackball

---
 .../default/xui/en/widgets/sun_moon_trackball.xml  | 68 ++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml

(limited to 'indra/newview/skins/default/xui/en/widgets')

diff --git a/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml b/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
new file mode 100644
index 0000000000..68681b8228
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<sun_moon_trackball
+    name="virtualtrackball"
+    width="150"
+    height="150"
+    user_resize="false"     
+    increment_angle_mouse="0.5f"
+    increment_angle_btn="3.0f"    
+    image_sphere="VirtualTrackball_Sphere"
+    image_moon_back="VirtualTrackball_Moon_Back"
+    image_moon_front="VirtualTrackball_Moon_Front"
+    image_sun_back="VirtualTrackball_Sun_Back"
+    image_sun_front="VirtualTrackball_Sun_Front">
+
+    <sun_moon_trackball.border
+        visible="true"/>
+
+    <sun_moon_trackball.labelN
+        font="SansSerif"
+        name="labelN"
+        valign="bottom"
+        halign="left"
+        label="N"/>
+    <sun_moon_trackball.labelS
+        font="SansSerif"
+        name="labelS"
+        valign="top"
+        halign="left"
+        label="S"/>
+    <sun_moon_trackball.labelW
+        font="SansSerif"
+        name="labelW"
+        valign="top"
+        halign="right"
+        label="W"/>
+    <sun_moon_trackball.labelE
+        font="SansSerif"
+        name="labelE"
+        valign="top"
+        halign="left"
+        label="E"/>
+
+    <sun_moon_trackball.button_rotate_top
+        name="btn_rotate_top"
+        image_unselected="VirtualTrackball_Rotate_Top"
+        image_selected="VirtualTrackball_Rotate_Top"
+        image_disabled="VirtualTrackball_Rotate_Top" />
+
+    <sun_moon_trackball.button_rotate_bottom
+        name="btn_rotate_bottom"
+        image_unselected="VirtualTrackball_Rotate_Bottom"
+        image_selected="VirtualTrackball_Rotate_Bottom"
+        image_disabled="VirtualTrackball_Rotate_Bottom" />
+
+    <sun_moon_trackball.button_rotate_left
+        name="btn_rotate_left"
+        image_unselected="VirtualTrackball_Rotate_Left"
+        image_selected="VirtualTrackball_Rotate_Left"
+        image_disabled="VirtualTrackball_Rotate_Left" />
+
+    <sun_moon_trackball.button_rotate_right
+        name="btn_rotate_right"
+        image_unselected="VirtualTrackball_Rotate_Right"
+        image_selected="VirtualTrackball_Rotate_Right"
+        image_disabled="VirtualTrackball_Rotate_Right" />
+
+</sun_moon_trackball>
+
-- 
cgit v1.2.3


From 6a54e0948d651963399da82cfc5672125b9442e7 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Wed, 8 Aug 2018 03:28:37 +0300
Subject: MAINT-8900 LLVirtualTrackball improvement: added click-to-set mode

---
 indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/widgets')

diff --git a/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml b/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
index 68681b8228..3a9655b317 100644
--- a/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
+++ b/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
@@ -4,7 +4,7 @@
     width="150"
     height="150"
     user_resize="false"     
-    increment_angle_mouse="0.5f"
+    increment_angle_mouse="1.5f"
     increment_angle_btn="3.0f"    
     image_sphere="VirtualTrackball_Sphere"
     image_moon_back="VirtualTrackball_Moon_Back"
-- 
cgit v1.2.3


From 7da3a1eb4f14b67c698977eb1947ce06a312d507 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Mon, 6 Aug 2018 17:49:50 +0100
Subject: WIP check-in to allow merge of upstream changes.

---
 .../skins/default/xui/en/widgets/density_ctrl.xml  | 164 +++++++++++++++++++++
 1 file changed, 164 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/widgets/density_ctrl.xml

(limited to 'indra/newview/skins/default/xui/en/widgets')

diff --git a/indra/newview/skins/default/xui/en/widgets/density_ctrl.xml b/indra/newview/skins/default/xui/en/widgets/density_ctrl.xml
new file mode 100644
index 0000000000..0f3f0159db
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/density_ctrl.xml
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<densityctrl
+ border="true"
+ follows="all"
+ label="Density"
+ name="density_ctrl"
+ layout="topleft"
+ left="0"
+ top="0"
+ width="320"
+ height="240">
+    <text
+     follows="left|top"
+     height="11"
+     layout="topleft"
+     left="15"
+     top_pad="-5"
+     width="120">
+Exponential Term
+    </text>
+    <slider
+     decimal_digits="2"
+     follows="left|top"
+     height="16"
+     increment="0.01"
+     initial_value="0"
+     layout="topleft"
+     left="15"
+     min_val="0"
+     max_val="1"
+     name="level_exponential"
+     top_delta="15"
+     width="200"
+     can_edit_text="true"/>
+
+    <view
+     left_pad="15"
+     top="15"
+     name="preview_image"
+     height="140"
+     width="140"
+     follows="left|top"
+    />
+    <text
+     follows="left|top"
+     height="11"
+     layout="topleft"
+     left="15"
+     top_pad="-5"
+     width="120">
+Exponential Scale Factor
+    </text>
+    <slider
+     decimal_digits="2"
+     follows="left|top"
+     height="16"
+     increment="0.01"
+     initial_value="0"
+     layout="topleft"
+     left="15"
+     min_val="0"
+     max_val="1"
+     name="exponential_scale"
+     top_delta="15"
+     width="200"
+     can_edit_text="true"/>
+
+    <text
+     follows="left|top"
+     height="11"
+     layout="topleft"
+     left="15"
+     top_pad="-5"
+     width="120">
+Linear Term
+    </text>
+    <slider
+     decimal_digits="2"
+     follows="left|top"
+     height="16"
+     increment="0.01"
+     initial_value="0"
+     layout="topleft"
+     left="15"
+     min_val="0"
+     max_val="1"
+     name="level_linear"
+     top_delta="15"
+     width="200"
+     can_edit_text="true"/>
+
+    <text
+     follows="left|top"
+     height="11"
+     layout="topleft"
+     left="15"
+     top_pad="-5"
+     width="120">
+Constant Term
+    </text>
+    <slider
+     decimal_digits="2"
+     follows="left|top"
+     height="16"
+     increment="0.01"
+     initial_value="0"
+     layout="topleft"
+     left="15"
+     min_val="0"
+     max_val="1"
+     name="level_constant"
+     top_delta="15"
+     width="200"
+     can_edit_text="true"/>
+
+    <text
+     follows="left|top"
+     height="11"
+     layout="topleft"
+     left="15"
+     top_pad="15"
+     width="80">
+Max Altitude
+    </text>
+    <slider
+     decimal_digits="0"
+     follows="left|top"
+     height="16"
+     increment="1"
+     initial_value="0"
+     layout="topleft"
+     left="15"
+     min_val="1000"
+     max_val="40000"
+     name="max_altitude"
+     top_delta="15"
+     width="200"
+     can_edit_text="true"/>
+
+    <text
+     follows="left|top"
+     height="11"
+     layout="topleft"
+     name="aniso_factor_label"
+     left="15"
+     top_pad="15"
+     width="80">
+Anisotropy Factor
+    </text>
+    <slider
+     decimal_digits="0"
+     follows="left|top"
+     height="16"
+     increment="1"
+     initial_value="0"
+     layout="topleft"
+     left="15"
+     min_val="1000"
+     max_val="40000"
+     name="aniso_factor"
+     top_delta="15"
+     width="200"
+     can_edit_text="true"/>
+</densityctrl>
-- 
cgit v1.2.3


From d965af2b0cbf62e2e1601f504e0d548da40aa742 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Fri, 24 Aug 2018 02:40:12 +0300
Subject: MAINT-9032 Virtual Track Ball improvements

---
 .../skins/default/xui/en/widgets/sun_moon_trackball.xml  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/widgets')

diff --git a/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml b/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
index 3a9655b317..0e729c821a 100644
--- a/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
+++ b/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
@@ -43,26 +43,26 @@
     <sun_moon_trackball.button_rotate_top
         name="btn_rotate_top"
         image_unselected="VirtualTrackball_Rotate_Top"
-        image_selected="VirtualTrackball_Rotate_Top"
-        image_disabled="VirtualTrackball_Rotate_Top" />
+        image_selected="VirtualTrackball_Rotate_Top_Active"
+        image_disabled="Blank" />
 
     <sun_moon_trackball.button_rotate_bottom
         name="btn_rotate_bottom"
         image_unselected="VirtualTrackball_Rotate_Bottom"
-        image_selected="VirtualTrackball_Rotate_Bottom"
-        image_disabled="VirtualTrackball_Rotate_Bottom" />
+        image_selected="VirtualTrackball_Rotate_Bottom_Active"
+        image_disabled="Blank" />
 
     <sun_moon_trackball.button_rotate_left
         name="btn_rotate_left"
         image_unselected="VirtualTrackball_Rotate_Left"
-        image_selected="VirtualTrackball_Rotate_Left"
-        image_disabled="VirtualTrackball_Rotate_Left" />
+        image_selected="VirtualTrackball_Rotate_Left_Active"
+        image_disabled="Blank" />
 
     <sun_moon_trackball.button_rotate_right
         name="btn_rotate_right"
         image_unselected="VirtualTrackball_Rotate_Right"
-        image_selected="VirtualTrackball_Rotate_Right"
-        image_disabled="VirtualTrackball_Rotate_Right" />
+        image_selected="VirtualTrackball_Rotate_Right_Active"
+        image_disabled="Blank" />
 
 </sun_moon_trackball>
 
-- 
cgit v1.2.3


From f0eb06ed13313e3c5a78224506cde7a894591880 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Mon, 24 Sep 2018 18:24:32 +0300
Subject: SL-1546 VitrualTrackBall - Reduced the angle change per button click
 to 1deg

---
 indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/widgets')

diff --git a/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml b/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
index 0e729c821a..9fa77855c0 100644
--- a/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
+++ b/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
@@ -5,7 +5,7 @@
     height="150"
     user_resize="false"     
     increment_angle_mouse="1.5f"
-    increment_angle_btn="3.0f"    
+    increment_angle_btn="1.0f"    
     image_sphere="VirtualTrackball_Sphere"
     image_moon_back="VirtualTrackball_Moon_Back"
     image_moon_front="VirtualTrackball_Moon_Front"
-- 
cgit v1.2.3


From 3a78da70ad14eab11218cc056c2a3703af1b9738 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 29 Mar 2019 17:39:19 +0200
Subject: SL-10833 FIXED [EEP] Text in the Sky Altitudes boxes is low contrast
 and difficult to read.

---
 indra/newview/skins/default/xui/en/widgets/line_editor.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui/en/widgets')

diff --git a/indra/newview/skins/default/xui/en/widgets/line_editor.xml b/indra/newview/skins/default/xui/en/widgets/line_editor.xml
index a054960bf8..f39e086196 100644
--- a/indra/newview/skins/default/xui/en/widgets/line_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/line_editor.xml
@@ -6,6 +6,7 @@
              commit_on_focus_lost="true"
              ignore_tab="true"
              cursor_color="TextCursorColor"
+             bg_color="White"
              text_color="TextFgColor"
 			 text_pad_left="2"
              text_readonly_color="TextFgReadOnlyColor"
-- 
cgit v1.2.3