move base back to default because doing it as a backout was causing merge errors

1 files changed, 126 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_telehub.xml b/indra/newview/skins/default/xui/en/floater_telehub.xml
new file mode 100644
index 0000000000..da412ed8a0
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_telehub.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- Explicit left edge to avoid overlapping build tools -->
+<floater
+ legacy_header_height="18"
+ height="250"
+ layout="topleft"
+ left="300" 
+ name="telehub"
+ help_topic="telehub"
+ title="TELEHUB"
+ width="330">
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="status_text_connected"
+     top="24"
+     width="315">
+        Telehub connected to object [OBJECT]
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_delta="0"
+     name="status_text_not_connected"
+     top_delta="0"
+     width="315">
+        No telehub connected.
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left_delta="0"
+     name="help_text_connected"
+     top_delta="16"
+     width="315">
+        To remove, click Disconnect.
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left_delta="0"
+     name="help_text_not_connected"
+     top_delta="0"
+     width="315">
+        Select object and click Connect Telehub.
+    </text>
+    <button
+     follows="top|left"
+     height="23"
+     label="Connect Telehub"
+     layout="topleft"
+     left_delta="0"
+     name="connect_btn"
+     top_delta="20"
+     width="130" />
+    <button
+     follows="top|left"
+     height="23"
+     label="Disconnect"
+     layout="topleft"
+     left_pad="10"
+     name="disconnect_btn"
+     top_delta="0"
+     width="130" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="14"
+     layout="topleft"
+     left="10"
+     name="spawn_points_text"
+     top="84"
+     width="315">
+        Spawn Points (positions, not objects):
+    </text>
+    <scroll_list
+     follows="left|top"
+     height="60"
+     layout="topleft"
+     name="spawn_points_list"
+     width="315" />
+    <button
+     follows="top|left"
+     height="23"
+     label="Add Spawn"
+     layout="topleft"
+     name="add_spawn_point_btn"
+     width="130" />
+    <button
+     follows="top|left"
+     height="23"
+     label="Remove Spawn"
+     layout="topleft"
+     left_pad="10"
+     name="remove_spawn_point_btn"
+     width="130" />
+    <text
+     type="string"
+     length="1"
+     follows="top|left"
+     height="56"
+     layout="topleft"
+     left="10"
+     name="spawn_point_help"
+     word_wrap="true"
+     width="317">
+        Select object and click "Add Spawn" to specify position.
+You can then move or delete the object.
+Positions are relative to the telehub center.
+Select an item in list to highlight it inworld.
+    </text>
+</floater>