Merge

1 files changed, 138 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_beacons.xml b/indra/newview/skins/default/xui/en/floater_beacons.xml
new file mode 100644
index 0000000000..4fc2b698d8
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_beacons.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ height="225"
+ layout="topleft"
+ name="beacons"
+ help_topic="beacons"
+ save_rect="true"
+ save_visibility="true"
+ single_instance="true"
+ title="BEACONS"
+ width="240">
+    <panel
+     follows="left|top|right|bottom"
+     height="200"
+     layout="topleft"
+     left="10"
+     name="beacons_panel"
+     top="20"
+     width="230">
+        <text
+         follows="all"
+         height="16"
+         font="SansSerif"
+         name="label_show"
+         text_color="White"
+         type="string">
+            Show :
+         </text>
+        <check_box
+         control_name="renderbeacons"
+         height="16"
+         width="100"
+         label="Beacons"
+         layout="topleft"
+         name="beacons" >
+          <check_box.commit_callback
+           function="Beacons.UICheck" />
+        </check_box>
+         <check_box
+         control_name="renderhighlights"
+         height="16"
+         left_pad="10"
+         label="Highlights"
+         layout="topleft"
+         name="highlights" >
+          <check_box.commit_callback
+           function="Beacons.UICheck" />
+        </check_box>
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         height="16"
+         layout="topleft"
+         left="20"
+         tool_tip="Beacon width"
+         name="beacon_width_label"
+         top_pad="3"
+         width="128">
+            Width:
+        </text>
+        <slider
+         control_name="DebugBeaconLineWidth"
+         decimal_digits="0"
+         height="16"
+         increment="1"
+         initial_value="1"
+         layout="topleft"
+         max_val="16"
+         min_val="1"
+         name="beacon_width"
+         top_pad="0"
+         width="180" />
+         <text
+         follows="all"
+         height="16"
+         font="SansSerif"
+         left="0"
+         top_pad="5"
+         name="label_objects"
+         text_color="White"
+         type="string">
+           For these objects:
+         </text>
+         <check_box
+         control_name="physicalbeacon"
+         height="16"
+         left="0"
+         label="Physical"
+         layout="topleft"
+         name="physical" >
+          <check_box.commit_callback
+           function="Beacons.UICheck" />
+        </check_box>
+        <check_box
+         control_name="scriptsbeacon"
+         height="16"
+         left="0"
+         label="Scripted"
+         layout="topleft"
+         name="scripted">
+          <check_box.commit_callback
+           function="Beacons.UICheck" />
+        </check_box>
+         <check_box
+         control_name="scripttouchbeacon"
+         height="16"
+         top_pad="4"
+         left="20"
+         label="Touch only"
+         layout="topleft"
+         name="touch_only" >
+          <check_box.commit_callback
+           function="Beacons.UICheck" />
+        </check_box>
+        <check_box
+         control_name="soundsbeacon"
+         height="16"
+         left="0"
+         label="Sound sources"
+         layout="topleft"
+         name="sounds" >
+          <check_box.commit_callback
+           function="Beacons.UICheck" />
+        </check_box>
+        <check_box
+         control_name="particlesbeacon"
+         height="16"
+         label="Particle sources"
+         layout="topleft"
+         name="particles" >
+          <check_box.commit_callback
+           function="Beacons.UICheck" />
+        </check_box>
+
+    </panel>
+</floater>