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.

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

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
index 56233d91ee..c03a206e88 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
@@ -454,7 +454,34 @@
              width="200">
                 Sun/Moon Position
             </text>
-            <multi_slider
+            
+            <joystick_quat
+              follows="left|top"
+              height="78"
+              layout="topleft"
+              left_delta="0"
+              name="WLSunRotation"
+              quadrant="left"
+              sound_flags="3"
+              visible="true"
+              tool_tip="Move sun in sky"
+              top="44"
+              width="78" />              />
+
+            <joystick_quat
+              follows="left|top"
+              height="78"
+              layout="topleft"
+              left_delta="96"
+              name="WLMoonRotation"
+              quadrant="left"
+              sound_flags="3"
+              visible="true"
+              tool_tip="Move moon in sky"
+              top="44"
+              width="78" />              />
+              
+            <!-- multi_slider
              can_edit_text="true"
              control_name="WLSunPos"
              decimal_digits="0"
@@ -644,7 +671,7 @@
              left_delta="10"
              name="WLEastAngle"
              top_pad="6"
-             width="200" />
+             width="200" / -->
 
         </panel>
         <panel
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