Merge of my DEV-36732 work and all the main line login api work that went on.

1 files changed, 23 insertions, 21 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
index 50aabfc895..e9342b772f 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_animation.xml
@@ -4,23 +4,11 @@
  height="85"
  layout="topleft"
  name="preview_anim"
- width="300">
+ width="280">
     <floater.string
      name="Title">
         Animation: [NAME]
     </floater.string>
-    <line_editor
-     border_style="line"
-     border_thickness="1"
-     follows="left|top|right"
-     font="SansSerif"
-     height="19"
-     layout="topleft"
-     left="93"
-     max_length="127"
-     name="desc"
-     top="19"
-     width="194" />
     <text
      type="string"
      length="1"
@@ -28,30 +16,44 @@
      font="SansSerif"
      height="19"
      layout="topleft"
-     left_delta="-80"
+     left="10"
      name="desc txt"
-     top_delta="0"
+     top="25"
      width="80">
         Description:
     </text>
-    <button
+    <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"
+     font="SansSerifSmall"
      label="Play in World"
      label_selected="Stop"
      layout="topleft"
-     left="27"
+     left="10"
      name="Anim play btn"
      tool_tip="Play this animation so that others can see it."
      top="47"
-     width="96" />
+     width="125" />
     <button
-     height="19"
+     height="20"
+     font="SansSerifSmall"
      label="Play Locally"
      label_selected="Stop"
      layout="topleft"
-     left_pad="54"
+     left_pad="5"
      name="Anim audition btn"
      tool_tip="Play this animation so that only you can see it."
      top_delta="0"
-     width="96" />
+     width="125" />
 </floater>