From 6157187e5bdff889613673f11852d9c25f96bf92 Mon Sep 17 00:00:00 2001
From: "Nyx (Neal Orman)" <nyx@lindenlab.com>
Date: Mon, 4 Jan 2010 15:33:07 -0500
Subject: EXT-3849 remove "show attachments in previews"

removing the checkbox in the appearance floater, as we don't
have time to implement this.

reviewed by Seraph
---
 indra/newview/skins/default/xui/en/floater_customize.xml | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml
index 94686f0bb0..0dc7d62b19 100644
--- a/indra/newview/skins/default/xui/en/floater_customize.xml
+++ b/indra/newview/skins/default/xui/en/floater_customize.xml
@@ -12,16 +12,6 @@
  title="APPEARANCE"
  top_delta="-185"
  width="524">
- <check_box
-             enabled="true"
-             height="23"
-             label="Show Attachments in Previews"
-             layout="topleft"
-             left="110"
-             name="show attachments"
-             tool_tip="Display attachments on your avatar in the preview panels below."
-             top="20"
-             width="146" />
     <tab_container
      height="517"
      layout="topleft"
-- 
cgit v1.2.3


From f3ba1f4442dd5bf3d26ab2c6403c16c24b252d60 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Mon, 4 Jan 2010 17:28:31 -0500
Subject: EXT-3717 : Reset Filters in My Inventory doesn't work

Simple XML change; function call string was incorrect.
---
 indra/newview/skins/default/xui/en/panel_main_inventory.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 4353b306cd..58437cd4d2 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -208,7 +208,7 @@ halign="center"
              layout="topleft"
              name="Reset Current">
                 <menu_item_call.on_click
-                 function="Inventory.ResetFilter" />
+                 function="Inventory.ResetFilters" />
             </menu_item_call>
             <menu_item_call
              label="Close All Folders"
-- 
cgit v1.2.3