From ffc6393309d06446f9d1361f0f0282b2110768ae Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Mon, 8 Oct 2018 22:08:35 +0100
Subject: SL-9751

Add optional moon brightness setting
---
 .../default/xui/en/floater_edit_ext_day_cycle.xml  |  6 ++---
 .../default/xui/en/panel_settings_sky_sunmoon.xml  | 29 +++++++++++++++++++---
 2 files changed, 29 insertions(+), 6 deletions(-)

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

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 e1c08a24f2..9aa7c6f499 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
@@ -6,9 +6,9 @@
         save_rect="false"
         title="Edit Day Cycle"
         width="705"
-        height="650"
+        height="700"
         min_width="705"
-        min_height="650"
+        min_height="700"
         single_instance="true" 
         can_resize="false">
 
@@ -25,7 +25,7 @@
     <!-- Layout -->
     <layout_stack name="outer_stack"
             width="705"
-            height="650"
+            height="700"
             follows="all"
             animate="false"
             top="0"
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 6d12f6bb94..1332ecd965 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
@@ -14,14 +14,14 @@
             top="5"
             right="-5"
             bottom="-5"
-            orientation="hoizontal">
+            orientation="horizontal">
         <layout_panel
                 border="true"
                 bevel_style="in"
                 auto_resize="true"
                 user_resize="false"
                 visible="true"
-                height="350">
+                height="400">
             <text
                     follows="left|top"
                     height="10"
@@ -176,6 +176,29 @@
                     top_delta="15"
                     width="250"
                     can_edit_text="true"/>
+            <text
+                    follows="left|top"
+                    height="10"
+                    layout="topleft"
+                    left_delta="-5"
+                    top_delta="22"
+                    width="200">
+                Moon Brightness:
+            </text>
+            <slider
+                    decimal_digits="2"
+                    follows="left|top"
+                    height="16"
+                    increment="0.01"
+                    initial_value="0"
+                    layout="topleft"
+                    left_delta="5"
+                    min_val="0.0"
+                    max_val="1.0"
+                    name="moon_brightness"
+                    top_delta="15"
+                    width="250"
+                    can_edit_text="true"/>
         </layout_panel>
         <layout_panel
                 border="false"
@@ -183,7 +206,7 @@
                 auto_resize="true"
                 user_resize="false"
                 visible="true"
-                height="350">
+                height="400">
             <layout_stack 
                     left="5"
                     top="5"
-- 
cgit v1.2.3