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

ignore-dead-branch

1 files changed, 281 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
new file mode 100644
index 0000000000..8bff916f9d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
@@ -0,0 +1,281 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_minimize="false"
+ height="408"
+ layout="topleft"
+ name="Inventory Finder"
+ title="inventory_recent_items"
+ width="160">
+    <icon
+     height="16"
+     image_name="inv_item_animation.tga"
+     layout="topleft"
+     left="8"
+     mouse_opaque="true"
+     name="icon_animation"
+     top="22"
+     width="16" />
+    <check_box
+     height="16"
+     label="Animation"
+     layout="topleft"
+     left_pad="2"
+     name="check_animation"
+     top_delta="0"
+     width="126" />
+    <icon
+     height="16"
+     image_name="inv_item_callingcard_online.tga"
+     layout="topleft"
+     left="8"
+     mouse_opaque="true"
+     name="icon_calling_card"
+     top="42"
+     width="16" />
+    <check_box
+     height="16"
+     label="Calling Cards"
+     layout="topleft"
+     left_pad="2"
+     name="check_calling_card"
+     top_delta="0"
+     width="126" />
+    <icon
+     height="16"
+     image_name="inv_item_shirt.tga"
+     layout="topleft"
+     left="8"
+     mouse_opaque="true"
+     name="icon_clothing"
+     top="62"
+     width="16" />
+    <check_box
+     height="16"
+     label="Clothing"
+     layout="topleft"
+     left_pad="2"
+     name="check_clothing"
+     top_delta="0"
+     width="126" />
+    <icon
+     height="16"
+     image_name="inv_item_gesture.tga"
+     layout="topleft"
+     left="8"
+     mouse_opaque="true"
+     name="icon_gesture"
+     top="82"
+     width="16" />
+    <check_box
+     height="16"
+     label="Gestures"
+     layout="topleft"
+     left_pad="2"
+     name="check_gesture"
+     top_delta="0"
+     width="126" />
+    <icon
+     height="16"
+     image_name="inv_item_landmark_visited.tga"
+     layout="topleft"
+     left="8"
+     mouse_opaque="true"
+     name="icon_landmark"
+     top="102"
+     width="16" />
+    <check_box
+     height="16"
+     label="Landmarks"
+     layout="topleft"
+     left_pad="2"
+     name="check_landmark"
+     top_delta="0"
+     width="126" />
+    <icon
+     height="16"
+     image_name="inv_item_notecard.tga"
+     layout="topleft"
+     left="8"
+     mouse_opaque="true"
+     name="icon_notecard"
+     top="122"
+     width="16" />
+    <check_box
+     height="16"
+     label="Notecards"
+     layout="topleft"
+     left_pad="2"
+     name="check_notecard"
+     top_delta="0"
+     width="126" />
+    <icon
+     height="16"
+     image_name="inv_item_object.tga"
+     layout="topleft"
+     left="8"
+     mouse_opaque="true"
+     name="icon_object"
+     top="142"
+     width="16" />
+    <check_box
+     height="16"
+     label="Objects"
+     layout="topleft"
+     left_pad="2"
+     name="check_object"
+     top_delta="0"
+     width="126" />
+    <icon
+     height="16"
+     image_name="inv_item_script.tga"
+     layout="topleft"
+     left="8"
+     mouse_opaque="true"
+     name="icon_script"
+     top="162"
+     width="16" />
+    <check_box
+     height="16"
+     label="Scripts"
+     layout="topleft"
+     left_pad="2"
+     name="check_script"
+     top_delta="0"
+     width="126" />
+    <icon
+     height="16"
+     image_name="inv_item_sound.tga"
+     layout="topleft"
+     left="8"
+     mouse_opaque="true"
+     name="icon_sound"
+     top="182"
+     width="16" />
+    <check_box
+     height="16"
+     label="Sounds"
+     layout="topleft"
+     left_pad="2"
+     name="check_sound"
+     top_delta="0"
+     width="126" />
+    <icon
+     height="16"
+     image_name="inv_item_texture.tga"
+     layout="topleft"
+     left="8"
+     mouse_opaque="true"
+     name="icon_texture"
+     top="202"
+     width="16" />
+    <check_box
+     height="16"
+     label="Textures"
+     layout="topleft"
+     left_pad="2"
+     name="check_texture"
+     top_delta="0"
+     width="126" />
+    <icon
+     height="16"
+     image_name="inv_item_snapshot.tga"
+     layout="topleft"
+     left="8"
+     mouse_opaque="true"
+     name="icon_snapshot"
+     top="222"
+     width="16" />
+    <check_box
+     height="16"
+     label="Snapshots"
+     layout="topleft"
+     left_pad="2"
+     name="check_snapshot"
+     top_delta="0"
+     width="126" />
+    <button
+     follows="left|top"
+     height="20"
+     label="All"
+     label_selected="All"
+     layout="topleft"
+     left="8"
+     name="All"
+     top="242"
+     width="100" />
+    <button
+     follows="left|top"
+     height="20"
+     label="None"
+     label_selected="None"
+     layout="topleft"
+     left_delta="0"
+     name="None"
+     top_pad="4"
+     width="100" />
+    <check_box
+     height="16"
+     label="Always show folders"
+     layout="topleft"
+     left_delta="0"
+     name="check_show_empty"
+     top_pad="4"
+     width="144" />
+    <check_box
+     height="16"
+     label="Since Logoff"
+     layout="topleft"
+     left_delta="0"
+     name="check_since_logoff"
+     top_pad="4"
+     width="144" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     halign="center"
+     height="12"
+     layout="topleft"
+     left_delta="0"
+     name="- OR -"
+     top_delta="16"
+     width="144">
+        - OR -
+    </text>
+    <spinner
+     follows="left|top"
+     height="16"
+     increment="1"
+     initial_value="0"
+     label="Hours Ago"
+     label_width="64"
+     layout="topleft"
+     left_delta="0"
+     max_val="240000"
+     name="spin_hours_ago"
+     top_pad="4"
+     width="144" />
+    <spinner
+     follows="left|top"
+     height="16"
+     increment="1"
+     initial_value="0"
+     label="Days Ago"
+     label_width="64"
+     layout="topleft"
+     left_delta="0"
+     max_val="10000"
+     name="spin_days_ago"
+     top_pad="4"
+     width="144" />
+    <button
+     follows="top|right"
+     height="20"
+     label="Close"
+     label_selected="Close"
+     layout="topleft"
+     name="Close"
+     right="-6"
+     top="382"
+     width="76" />
+</floater>