From 2f188b36d9b892e48ba72c3485b34036273d755b Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Wed, 5 Dec 2018 17:14:06 +0200
Subject: SL-10167 Change wording on Add/Load/Delete buttons in the day editor

---
 indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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

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 9aa7c6f499..cac6f334c7 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
@@ -21,6 +21,8 @@
     <!-- Substitutions -->
     <string name="time_label"> ([HH]:[MM])</string>
     <string name="sky_track_label">Sky [ALT]</string>
+    <string name="sky_label">Sky</string>
+    <string name="water_label">Water</string>
 
     <!-- Layout -->
     <layout_stack name="outer_stack"
@@ -400,7 +402,7 @@
                                 follows="top|left"
                                 height="23"
                                 width="90"
-                                label="Add Frame"
+                                label="Add [FRAME]"
                                 left_pad="175"
                                 top_delta="-20"
                                 name="add_frame" />
@@ -408,7 +410,7 @@
                                 follows="top|left"
                                 height="23"
                                 width="90"
-                                label="Load Frame"
+                                label="Load [FRAME]"
                                 top_pad="0"
                                 left_delta="0"
                                 name="btn_load_frame" />
@@ -416,7 +418,7 @@
                                 follows="left|top"
                                 height="23"
                                 width="90"
-                                label="Delete Frame"
+                                label="Delete [FRAME]"
                                 top_pad="0"
                                 left_delta="0"
                                 name="delete_frame" />
-- 
cgit v1.2.3


From ca336f26db4446b016ab89654bf75f7651294533 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Mon, 10 Dec 2018 17:35:29 +0200
Subject: SL-9698 [EEP] Add beacons that point to sun & moon position

---
 .../skins/default/xui/en/floater_beacons.xml       | 41 ++++++++++++++++++++--
 indra/newview/skins/default/xui/en/strings.xml     |  2 ++
 2 files changed, 41 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_beacons.xml b/indra/newview/skins/default/xui/en/floater_beacons.xml
index 3d29356b22..d5947fc0af 100644
--- a/indra/newview/skins/default/xui/en/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/en/floater_beacons.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- height="245"
+ height="310"
  layout="topleft"
  name="beacons"
  help_topic="beacons"
@@ -12,7 +12,7 @@
  width="240">
     <panel
      follows="left|top|right|bottom"
-     height="240"
+     height="305"
      layout="topleft"
      left="10"
      name="beacons_panel"
@@ -143,6 +143,43 @@
           <check_box.commit_callback
            function="Beacons.UICheck" />
         </check_box>
+        <view_border
+         bevel_style="in"
+         height="0"
+         layout="topleft"
+         left="0"
+         name="cost_text_border"
+         top_pad="5"
+         width="220"/>
+        <text
+         follows="all"
+         height="16"
+         font="SansSerif"
+         left="0"
+         top_pad="7"
+         name="label_objects"
+         text_color="White"
+         type="string">
+           Show direction to:
+         </text>
+        <check_box
+         control_name="sunbeacon"
+         height="16"
+         label="Sun"
+         layout="topleft"
+         name="sun" >
+          <check_box.commit_callback
+           function="Beacons.UICheck" />
+        </check_box>
+        <check_box
+         control_name="moonbeacon"
+         height="16"
+         label="Moon"
+         layout="topleft"
+         name="moon" >
+          <check_box.commit_callback
+           function="Beacons.UICheck" />
+        </check_box>
 
     </panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 33c2224b9d..10e98719a4 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4094,6 +4094,8 @@ Try enclosing path to the editor with double quotes.
   <string name="BeaconScriptedTouch">Viewing scripted object with touch function beacons (red)</string>
   <string name="BeaconSound">Viewing sound beacons (yellow)</string>
   <string name="BeaconMedia">Viewing media beacons (white)</string>
+  <string name="BeaconSun">Viewing sun direction beacon (orange)</string>
+  <string name="BeaconMoon">Viewing moon direction beacon (purple)</string>
   <string name="ParticleHiding">Hiding Particles</string>
 
   <!-- commands -->
-- 
cgit v1.2.3