merge

1 files changed, 0 insertions, 364 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
deleted file mode 100644
index f76a56bda4..0000000000
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- background_visible="true"
-	bevel_style="in"
- follows="all"
- height="570"
- label="Wearable"
- layout="topleft"
-left="0"
- name="panel_edit_wearable"
-	top="0"
- width="333">
-	<string
-		name="edit_shape_title">
-		Editing Shape
-	</string>
-	<string
-		name="edit_skin_title">
-		Editing Skin
-	</string>
-	<string
-		name="edit_hair_title">
-		Editing Hair
-	</string>
-	<string
-		name="edit_eyes_title">
-		Editing Eyes
-	</string>
-	<string
-		name="edit_shirt_title">
-		Editing Shirt
-	</string>
-	<string
-		name="edit_pants_title">
-		Editing Pants
-	</string>
-	<string
-		name="edit_shoes_title">
-		Editing Shoes
-	</string>
-	<string
-		name="edit_socks_title">
-		Editing Socks
-	</string>
-	<string
-		name="edit_jacket_title">
-		Editing Jacket
-	</string>
-	<string
-		name="edit_skirt_title">
-		Editing Skirt
-	</string>
-	<string
-		name="edit_gloves_title">
-		Editing Gloves
-	</string>
-	<string
-		name="edit_undershirt_title">
-		Editing Undershirt
-	</string>
-	<string
-		name="edit_underpants_title">
-		Editing Underpants
-	</string>
-	<string
-		name="edit_alpha_title">
-		Editing Alpha Mask
-	</string>
-	<string
-		name="edit_tattoo_title">
-		Editing Tattoo
-	</string>
-	<string
-		name="shape_desc_text">
-		Shape:
-	</string>
-	<string
-		name="skin_desc_text">
-		Skin:
-	</string>
-	<string
-		name="hair_desc_text">
-		Hair:
-	</string>
-	<string
-		name="eyes_desc_text">
-		Eyes:
-	</string>
-	<string
-		name="shirt_desc_text">
-		Shirt:
-	</string>
-	<string
-		name="pants_desc_text">
-		Pants:
-	</string>
-	<string
-		name="shoes_desc_text">
-		Shoes:
-	</string>
-	<string
-		name="socks_desc_text">
-		Socks:
-	</string>
-	<string
-		name="jacket_desc_text">
-		Jacket:
-	</string>
-	<string
-		name="skirt_skirt_desc_text">
-		Skirt:
-	</string>
-	<string
-		name="gloves_desc_text">
-		Gloves:
-	</string>
-	<string
-		name="undershirt_desc_text">
-		Undershirt:
-	</string>
-	<string
-		name="underpants_desc_text">
-		Underpants:
-	</string>
-	<string
-		name="alpha_desc_text">
-		Alpha Mask:
-	</string>
-	<string
-		name="tattoo_desc_text">
-		Tattoo:
-	</string>
-    <button
-     follows="top|left"
-     height="25"
-     width="25"
-     image_overlay="BackArrow_Off"
-     layout="topleft"
-     name="back_btn"
-     left="10"
-     top="7" />
-	<text
-	 follows="top|left"
-	 font="SansSerifHugeBold"
-	 height="22"
-	 layout="topleft"
-	 left_pad="15"
-	 name="edit_wearable_title"
-	 text_color="white"
-	 value="Editing Shape"
-	 width="270" />
-     <panel
-         border="true"
-         follows="top|left"
-         height="60"
-         label="Shirt"
-         layout="topleft"
-		 left="10"
-         name="wearable_type_panel"
-		 top_pad="10"
-         width="313">
-		 <text
-		 follows="top|left"
-		 height="16"
-		 layout="topleft"
-		 left="10"
-		 name="description_text"
-		 value="Shape:"
-		 width="303" />
-		 <text_editor
-			 follows="all"
-			 height="23"
-			 left="10"
-			 layout="topleft"
-			 max_length="300"
-			 name="description"
-			 width="290" />
-	 </panel>
-	 <panel
-		 follows="all"
-		 height="400"
-		 layout="topleft"
-		 left="0"
-		 name="edit_subpanel_container"
-		 top_pad="10"
-		 width="333">
-		 <panel
-			 filename="panel_edit_shape.xml"
-			 follows="all"
-			 height="400"
-			 layout="topleft"
-			 left="0"
-			 name="edit_shape_panel"
-			 top="0"
-			 visible="false"
-			 width="333" />
-		 <panel
-			 filename="panel_edit_skin.xml"
-			 follows="all"
-			 height="400"
-			 layout="topleft"
-			 left="0"
-			 name="edit_skin_panel"
-			 top="0"
-			 visible="false"
-			 width="333" />
-		 <panel
-			 filename="panel_edit_hair.xml"
-			 follows="all"
-			 height="400"
-			 layout="topleft"
-			 left="0"
-			 name="edit_hair_panel"
-			 top="0"
-			 visible="false"
-			 width="333" />
-		 <panel
-			 filename="panel_edit_eyes.xml"
-			 follows="all"
-			 height="400"
-			 layout="topleft"
-			 left="0"
-			 name="edit_eyes_panel"
-			 top="0"
-			 visible="false"
-			 width="333" />
-		 <panel
-			 filename="panel_edit_shirt.xml"
-			 follows="all"
-			 height="400"
-			 layout="topleft"
-			 left="0"
-			 name="edit_shirt_panel"
-			 top="0"
-			 visible="false"
-			 width="333" />
-		 <panel
-			 filename="panel_edit_pants.xml"
-			 follows="all"
-			 height="400"
-			 layout="topleft"
-			 left="0"
-			 name="edit_pants_panel"
-			 top="0"
-			 visible="false"
-			 width="333" />
-		 <panel
-			 filename="panel_edit_shoes.xml"
-			 follows="all"
-			 height="400"
-			 layout="topleft"
-			 left="0"
-			 name="edit_shoes_panel"
-			 top="0"
-			 visible="false"
-			 width="333" />
-		 <panel
-			 filename="panel_edit_socks.xml"
-			 follows="all"
-			 height="400"
-			 layout="topleft"
-			 left="0"
-			 name="edit_socks_panel"
-			 top="0"
-			 visible="false"
-			 width="333" />
-		 <panel
-			 filename="panel_edit_jacket.xml"
-			 follows="all"
-			 height="400"
-			 layout="topleft"
-			 left="0"
-			 name="edit_jacket_panel"
-			 top="0"
-			 visible="false"
-			 width="333" />
-		 <panel
-			 filename="panel_edit_skirt.xml"
-			 follows="all"
-			 height="400"
-			 layout="topleft"
-			 left="0"
-			 name="edit_skirt_panel"
-			 top="0"
-			 visible="false"
-			 width="333" />
-		 <panel
-			 filename="panel_edit_gloves.xml"
-			 follows="all"
-			 height="400"
-			 layout="topleft"
-			 left="0"
-			 name="edit_gloves_panel"
-			 top="0"
-			 visible="false"
-			 width="333" />
-		 <panel
-			 filename="panel_edit_undershirt.xml"
-			 follows="all"
-			 height="400"
-			 layout="topleft"
-			 left="0"
-			 name="edit_undershirt_panel"
-			 top="0"
-			 visible="false"
-			 width="333" />
-		 <panel
-			 filename="panel_edit_underpants.xml"
-			 follows="all"
-			 height="400"
-			 layout="topleft"
-			 left="0"
-			 name="edit_underpants_panel"
-			 top="0"
-			 visible="false"
-			 width="333" />
-		 <panel
-			 filename="panel_edit_alpha.xml"
-			 follows="all"
-			 height="400"
-			 layout="topleft"
-			 left="0"
-			 name="edit_alpha_panel"
-			 top="0"
-			 visible="false"
-			 width="333" />
-		 <panel
-			 filename="panel_edit_tattoo.xml"
-			 follows="all"
-			 height="400"
-			 layout="topleft"
-			 left="0"
-			 name="edit_tattoo_panel"
-			 top="0"
-			 visible="false"
-			 width="333" />
-	 </panel>
-	 <panel
-		 follows="all"
-		 height="25"
-		 layout="bottom|left|right"
-		 left="0"
-		 name="button_panel"
-		 top_pad="10"
-		 width="333" >
-		 <button
-			 follows="bottomleft"
-			 layout="topleft"
-			 height="23"
-			 label="Save As"
-			 left="10"
-			 name="save_as_button"
-			 top="0"
-			 width="100" />
-		 <button
-			 follows="bottomleft"
-			 layout="topleft"
-			 height="23"
-			 label="Revert"
-			 left_pad="10"
-			 name="revert_button"
-			 width="100" />
-	 </panel>
-</panel>