merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@873 https://svn.aws.productengine.com/secondlife/pe/stable@888 -> viewer-2.0.0-pe-4

1 files changed, 16 insertions, 18 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml
index fa04ba7f15..9fc1627cb9 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml
@@ -3,7 +3,7 @@
  background_visible="true"
  bevel_style="in"
  bg_alpha_color="0.2 0.2 0.2 1"
- height="640"
+ height="660"
  layout="topleft"
  left="0"
  name="panel_pick_info"
@@ -39,7 +39,7 @@
      background_visible="true"
      bg_alpha_color="0.5 0.5 0.5 1"
      follows="left|right|top|bottom"
-     height="570"
+     height="580"
      layout="topleft"
      left="10"
      right="-10"
@@ -133,52 +133,50 @@
      follows="left|right|bottom"
      height="30"
      layout="topleft"
-     left="10"
+     left="8"
      name="buttons"
      right="-10"
-     top_pad="2">
+     bottom="660">
         <button
          follows="bottom|left"
          font="SansSerifSmallBold"
          height="25"
          label="Edit"
          layout="topleft"
-         left="10"
+         left="0"
          name="edit_btn"
-         top="3"
+         top="0"
          width="50" />
         <button
-         enabled="false"
-		 follows="bottom|left"
+         follows="bottom|left"
          font="SansSerifSmallBold"
          height="25"
          label="Teleport"
          layout="topleft"
-         left="65"
+         left_pad="5"
          name="teleport_btn"
-         top="3"
+         top="0"
          width="70" />
         <button
-         enabled="false"
-		 follows="bottom|left"
+         follows="bottom|left"
          font="SansSerifSmallBold"
          height="25"
          label="Show on Map"
          layout="topleft"
-         left="140"
+         left_pad="5"
          name="show_on_map_btn"
-         top="3"
+         top="0"
          width="90" />
         <button
-		 enabled="false"
-		 follows="bottom|right"
+         enabled="false"
+         follows="bottom|left"
          font="SansSerifSmallBold"
          height="25"
          label="Verb"
          layout="topleft"
-         left="270"
+         right="-5"
          name="verb_btn"
-         top="3"
+         top="0"
          width="50" />
     </panel>
 </panel>