Merge into viewer/viewer-20 yesterday's lindenlab/svn-imports-viewer-20

1 files changed, 19 insertions, 16 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_openobject.xml b/indra/newview/skins/default/xui/en/floater_openobject.xml
index e0ac2c1d51..17f7e9bf67 100644
--- a/indra/newview/skins/default/xui/en/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/en/floater_openobject.xml
@@ -7,41 +7,45 @@
  min_height="160"
  min_width="270"
  name="objectcontents"
+ help_topic="objectcontents"
  save_rect="true"
  title="Object Contents"
  width="300">
-    <panel_inventory
-     follows="left|top|right|bottom"
-     height="276"
-     layout="topleft"
-     left="8"
-     name="object_contents"
-     top="44"
-     width="284" />
-    <text
+   <text
      type="string"
      length="1"
      follows="left|top|right"
      font="SansSerif"
+     text_color="White"
      height="16"
      layout="topleft"
-     left_delta="0"
+     left="10"
      name="object_name"
-     top_delta="-20"
+     top="20"
      width="284">
         [DESC]:
     </text>
+    <panel_inventory
+     background_visible="false"
+     draw_border="false"
+     follows="all"
+     height="276"
+     layout="topleft"
+     left="10"
+     name="object_contents"
+     top_pad="0"
+     width="284" />
     <button
      follows="bottom|left"
      font="SansSerifSmall"
-     height="20"
+     height="23"
      label="Copy To Inventory"
      label_selected="Copy To Inventory"
      layout="topleft"
-     left_delta="2"
+     left="20"
      name="copy_to_inventory_button"
      tab_group="1"
-     top_pad="285"
+     top_pad="5"
      width="120">
         <button.commit_callback
          function="OpenObject.MoveToInventory" />
@@ -49,13 +53,12 @@
     <button
      follows="bottom|left"
      font="SansSerifSmall"
-     height="20"
+     height="23"
      label="Copy And Wear"
      label_selected="Copy And Wear"
      layout="topleft"
      left_pad="10"
      name="copy_and_wear_button"
-     top_delta="0"
      width="120">
         <button.commit_callback
          function="OpenObject.MoveAndWear" />