merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3

ignore-dead-branch

1 files changed, 57 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_openobject.xml b/indra/newview/skins/default/xui/en/floater_openobject.xml
new file mode 100644
index 0000000000..742934b57b
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_openobject.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_resize="true"
+ default_tab_group="1"
+ height="350"
+ layout="topleft"
+ min_height="160"
+ min_width="270"
+ name="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
+     type="string"
+     length="1"
+     follows="left|top|right"
+     font="SansSerif"
+     height="16"
+     layout="topleft"
+     left_delta="0"
+     name="object_name"
+     top_delta="-20"
+     width="284">
+        [DESC]:
+    </text>
+    <button
+     follows="bottom|left"
+     font="SansSerifSmall"
+     height="20"
+     label="Copy To Inventory"
+     label_selected="Copy To Inventory"
+     layout="topleft"
+     left_delta="2"
+     name="copy_to_inventory_button"
+     tab_group="1"
+     top_pad="285"
+     width="120" />
+    <button
+     follows="bottom|left"
+     font="SansSerifSmall"
+     height="20"
+     label="Copy And Wear"
+     label_selected="Copy And Wear"
+     layout="topleft"
+     left_pad="10"
+     name="copy_and_wear_button"
+     top_delta="0"
+     width="120" />
+</floater>