From 850c0f1e33ed5188b5346a7aeb3099ca29e0d2d0 Mon Sep 17 00:00:00 2001 From: Eric Tulla Date: Fri, 16 Oct 2009 20:11:51 +0000 Subject: Merge of latest avatar pipeline working branch into viewer2.0 branch. Result of: (NO CONFLICTS) svn merge -r 135985:136503 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-11 . --- indra/newview/skins/default/xui/en/menu_inventory.xml | 8 -------- 1 file changed, 8 deletions(-) (limited to 'indra/newview/skins/default/xui/en/menu_inventory.xml') diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index 04c7186b5f..6dc08ad3ef 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -457,14 +457,6 @@ function="Inventory.DoToSelected" parameter="replaceoutfit" /> - - -