merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3

ignore-dead-branch

1 files changed, 62 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_script_preview.xml b/indra/newview/skins/default/xui/en/floater_script_preview.xml
new file mode 100644
index 0000000000..cb3ff92363
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_script_preview.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ auto_tile="true"
+ can_resize="true"
+ height="550"
+ layout="topleft"
+ left_delta="343"
+ min_height="271"
+ min_width="290"
+ name="preview lsl text"
+ save_rect="true"
+ title="Script: Rotation Script"
+ top_delta="0"
+ width="500">
+    <floater.string
+     name="Title">
+        Script: [NAME]
+    </floater.string>
+    <panel
+     follows="left|top|right|bottom"
+     height="508"
+     layout="topleft"
+     left="0"
+     name="script panel"
+     top="42"
+     width="497" />
+    <icon
+     follows="top|right"
+     height="16"
+     image_name="icon_lock.tga"
+     layout="topleft"
+     left="444"
+     mouse_opaque="true"
+     name="lock"
+     top="3"
+     width="16" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     font="SansSerif"
+     height="19"
+     layout="topleft"
+     left="13"
+     name="desc txt"
+     top="19"
+     width="80">
+        Description:
+    </text>
+    <line_editor
+     border_style="line"
+     border_thickness="1"
+     follows="left|top|right"
+     font="SansSerif"
+     height="19"
+     layout="topleft"
+     left_delta="80"
+     max_length="127"
+     name="desc"
+     top_delta="0"
+     width="394" />
+</floater>