From 7a001186b3063c36a78b2537b81c75124e307ff7 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Thu, 9 Aug 2018 16:36:44 -0700
Subject: Adjust layout of sunmoon panel and size of ext day edit. Blank sun
 texture. Fix edit and transition in edit day cycle. Fix default and blank
 images in sky textures.

---
 .../default/xui/en/floater_edit_ext_day_cycle.xml  |  12 +--
 .../default/xui/en/panel_settings_sky_sunmoon.xml  | 116 ++++++++++-----------
 2 files changed, 60 insertions(+), 68 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index 5e38a289c9..e3cd72c39d 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -7,8 +7,8 @@
         title="Edit Day Cycle"
         width="705"
         height="650"
-        min_width="450"
-        min_height="85"
+        min_width="705"
+        min_height="650"
         can_resize="true">
 
     <!-- obsolete?, add as hint for 'save' button? -->
@@ -455,14 +455,14 @@
                 <layout_panel name="frame_settings_water"
                         auto_resize="true"
                         user_resize="true"
-                        height="500"
+                        height="420"
                         width="700"
                         min_height="0"
-                        visible="true">
+                        visible="false">
                     <tab_container
                             follows="all"
                             halign="left"
-                            height="430"
+                            height="420"
                             layout="topleft"
                             left="0"
                             name="water_tabs"
@@ -488,7 +488,7 @@
                         height="420"
                         width="700"
                         min_height="0"
-                        visible="false">
+                        visible="true">
                     <tab_container
                             follows="all"
                             halign="left"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
index 15d20e46b7..2b79a1056f 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -28,8 +28,51 @@
                     layout="topleft"
                     left_delta="15"
                     top_pad="15"
+                    font="SansSerifBold"
+                    width="120">
+                Sun &amp; Stars
+            </text>
+                    <text
+                            follows="left|top"
+                            height="10"
+                            layout="topleft"
+                            left_delta="10"
+                            top_delta="30"
+                            width="100">
+                        Position:
+                    </text>
+                    <sun_moon_trackball
+                        name="sun_rotation"
+                        follows="left|top"
+                        left_delta="0"
+                        top_delta="20"
+                        height="150"
+                        width="150"
+                        thumb_mode="sun" />
+                    <text
+                            follows="left|top"
+                            height="10"
+                            layout="topleft"
+                            left_delta="160"
+                            top_delta="-20"
+                            width="200">
+                        Image:
+                    </text>
+                    <texture_picker
+                            height="123"
+                            layout="topleft"
+                            left_delta="5"
+                            name="sun_image"
+                            top_pad="10"
+                            width="100"/>
+            <text
+                    follows="left|top"
+                    height="10"
+                    layout="topleft"
+                    left_delta="-5"
+                    top_delta="110"
                     width="80">
-                Sun Color:
+                Color:
             </text>
             <color_swatch
                     can_apply_immediately="true"
@@ -37,7 +80,7 @@
                     height="37"
                     label_height="0"
                     layout="topleft"
-                    left_delta="0"
+                    left_delta="5"
                     name="sun_moon_color"
                     top_pad="5"
                     width="60" />
@@ -45,8 +88,8 @@
                     follows="left|top"
                     height="10"
                     layout="topleft"
-                    left_delta="0"
-                    top_delta="57"
+                    left_delta="-160"
+                    top_delta="47"
                     width="200">
                 Glow Focus:
             </text>
@@ -61,15 +104,15 @@
                     min_val="0"
                     max_val="0.5"
                     name="glow_focus"
-                    top_delta="20"
-                    width="200"
+                    top_delta="15"
+                    width="250"
                     can_edit_text="true"/>
             <text
                     follows="left|top"
                     height="10"
                     layout="topleft"
                     left_delta="-5"
-                    top_delta="20"
+                    top_delta="22"
                     width="200">
                 Glow Size:
             </text>
@@ -84,8 +127,8 @@
                     min_val="1"
                     max_val="1.99"
                     name="glow_size"
-                    top_delta="20"
-                    width="200"
+                    top_delta="15"
+                    width="250"
                     can_edit_text="true"/>
             <text
                     follows="left|top"
@@ -107,8 +150,8 @@
                     min_val="0"
                     max_val="2"
                     name="star_brightness"
-                    top_delta="20"
-                    width="200"
+                    top_delta="15"
+                    width="250"
                     can_edit_text="true"/>
         </layout_panel>
         <layout_panel
@@ -125,57 +168,6 @@
                     bottom="-5"
                     follows="left|top|right|bottom"
                     orientation="vertical">
-                <layout_panel
-                        border="true"
-                        bevel_style="in"
-                        auto_resize="true"
-                        user_resize="true"
-                        visible="true"
-                        height="220">
-                    <text
-                            follows="left|top"
-                            height="10"
-                            layout="topleft"
-                            left_delta="15"
-                            top_pad="15"
-                            font="SansSerifBold"
-                            width="80">
-                        Sun
-                    </text>
-                    <text
-                            follows="left|top"
-                            height="10"
-                            layout="topleft"
-                            left_delta="10"
-                            top_delta="30"
-                            width="100">
-                        Position:
-                    </text>
-                    <sun_moon_trackball
-                        name="sun_rotation"
-                        follows="left|top"
-                        left_delta="0"
-                        top_delta="20"
-                        height="150"
-                        width="150"
-                        thumb_mode="sun" />
-                    <text
-                            follows="left|top"
-                            height="10"
-                            layout="topleft"
-                            left_delta="160"
-                            top_delta="-20"
-                            width="200">
-                        Image:
-                    </text>
-                    <texture_picker
-                            height="123"
-                            layout="topleft"
-                            left_delta="5"
-                            name="sun_image"
-                            top_pad="10"
-                            width="100"/>
-                </layout_panel>
                 <layout_panel
                         border="true"
                         bevel_style="in"
-- 
cgit v1.2.3