Backed out changeset d5b761982e63

This got pushed too early - sorry.  Sigh.

1 files changed, 17 insertions, 15 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
index 7769189219..d6de5af32d 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -38,27 +38,28 @@
    <scroll_container
      color="DkGray2"
      follows="all"
-     height="500"
+     height="510"
      layout="topleft"
      left="10"
      top_pad="10"
      name="profile_scroll"
+     reserve_scroll_corner="false"
      opaque="true"
      width="313">
     <panel
      name="scroll_content_panel"
-     follows="left|top|right"
+     follows="left|top"
      min_height="300"
      layout="topleft"
      top="0"
      background_visible="false"
-     height="500"
+     height="510"
      left="0"
-     width="285">
+     width="295">
     <texture_picker
      follows="left|top|right"
      height="197"
-     width="280"
+     width="290"
      layout="topleft"
      top="20"
      left="10"
@@ -76,7 +77,7 @@
         <text
          type="string"
          length="1"
-         follows="left|top|right"
+         follows="left|top"
          height="15"
          font="SansSerifSmall"
          font.style="BOLD"
@@ -85,7 +86,7 @@
          top="215"
          name="Name:"
          text_color="white"
-         width="280">
+         width="290">
             Title:
         </text>
         <line_editor
@@ -98,11 +99,11 @@
          max_length="63"
          name="pick_name"
          text_color="black"
-         width="280" />
+         width="290" />
         <text
          type="string"
          length="1"
-         follows="left|top|right"
+         follows="left|top"
          height="15"
          font="SansSerifSmall"
          font.style="BOLD"
@@ -111,13 +112,13 @@
          top_pad="20"
          name="description_label"
          text_color="white"
-         width="280">
+         width="290">
             Description:
         </text>
         <text_editor
          follows="left|top|right"
          height="100"
-         width="280"
+         width="290"
          hide_scrollbar="false"
          layout="topleft"
          left="10"
@@ -131,26 +132,27 @@
          length="1"
          font="SansSerifSmall"
          font.style="BOLD"
-         follows="left|top|right"
+         follows="left|top"
          height="15"
          layout="topleft"
          left="10"
          name="location_label"
          text_color="white"
          top_pad="20"
-         width="280">
+         width="290">
             Location:
         </text>
         <text
          type="string"
          length="1"
-         follows="left|top|right"
+         follows="left|top"
          height="50"
          layout="topleft"
          left="10"
          name="pick_location"
+         right="-10"
          top_pad="2"
-         width="280"
+         width="290"
          word_wrap="true">
             loading...
         </text>