diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-05 12:37:26 +0200 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-05 12:37:26 +0200 |
commit | ddf2cccdb926ca2aac226a90c4030f2d4e8c6f50 (patch) | |
tree | a1d7fe2f014b70e5b0d5fe3419b4e5eb85c0de48 /indra/newview/skins/default/xui/en | |
parent | 3c5976981dd06ccca45d9d2b9024a6c72fd7ea49 (diff) | |
parent | b282f04b31f60a3ddd9dcbd27eed2d2226a40e09 (diff) |
Merge from default branch.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_customize.xml | 10 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_main_inventory.xml | 2 |
2 files changed, 1 insertions, 11 deletions
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" 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" |