Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix

1 files changed, 59 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_preview_animation.xml b/indra/newview/skins/default/xui/en/floater_preview_animation.xml
new file mode 100644
index 0000000000..6dc073728b
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_preview_animation.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ auto_tile="true"
+ height="85"
+ layout="topleft"
+ name="preview_anim"
+ help_topic="preview_anim"
+ width="280">
+    <floater.string
+     name="Title">
+        Animation: [NAME]
+    </floater.string>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     font="SansSerif"
+     height="19"
+     layout="topleft"
+     left="10"
+     name="desc txt"
+     top="25"
+     width="80">
+        Description:
+    </text>
+    <line_editor
+     border_style="line"
+     border_thickness="1"
+     follows="left|top|right"
+     font="SansSerifSmall"
+     height="19"
+     layout="topleft"
+     left_delta="95"
+     max_length="127"
+     name="desc"
+     top="19"
+     width="170" />
+    <button
+     height="20"
+     label="Play Inworld"
+     label_selected="Stop"
+     layout="topleft"
+     left="10"
+     name="Anim play btn"
+     tool_tip="Play this animation so that others can see it"
+     top="47"
+     width="125" />
+    <button
+     height="20"
+     label="Play Locally"
+     label_selected="Stop"
+     layout="topleft"
+     left_pad="5"
+     name="Anim audition btn"
+     tool_tip="Play this animation so that only you can see it"
+     top_delta="0"
+     width="125" />
+</floater>