From 981a43b355e44daa7e1b4065b896ea4cd2fec3a2 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Mon, 23 Aug 2010 16:13:10 -0400
Subject: [PATCH] Created new wearable type. Added debug setting for disabling
 physics. Added disable-multiwear and disable-camera-reset to wearabletype.

---
 indra/newview/app_settings/settings.xml       |   13 +
 indra/newview/character/avatar_lad.xml        |   54 +-
 indra/newview/llagentwearables.cpp            |    4 +-
 indra/newview/llinventorybridge.cpp           |    5 +
 indra/newview/llinventoryicon.cpp             |    2 +
 indra/newview/llinventoryicon.h               |    4 +-
 indra/newview/llpaneleditwearable.cpp         |   15 +-
 indra/newview/llpaneleditwearable.h           |    1 +
 indra/newview/llpaneloutfitedit.cpp           |    1 +
 indra/newview/llpaneloutfitedit.h             |    1 +
 indra/newview/llsidepanelappearance.cpp       |    4 +-
 indra/newview/llsidepanelappearance.h         |    2 +-
 indra/newview/llviewerinventory.cpp           |    1 +
 indra/newview/llvoavatar.cpp                  |    7 +-
 indra/newview/llwearableitemslist.cpp         |    1 +
 indra/newview/llwearabletype.cpp              |   81 +-
 indra/newview/llwearabletype.h                |    5 +-
 .../skins/default/textures/textures.xml       |    1 +
 .../default/xui/en/floater_customize.xml      | 3389 -----------------
 .../default/xui/en/menu_attachment_self.xml   |    8 -
 .../skins/default/xui/en/menu_avatar_self.xml |   20 +-
 .../skins/default/xui/en/menu_inventory.xml   |    8 +
 .../default/xui/en/menu_inventory_add.xml     |    8 +
 .../skins/default/xui/en/menu_outfit_gear.xml |    8 +
 .../skins/default/xui/en/menu_viewer.xml      |   10 +
 .../default/xui/en/panel_edit_physics.xml     |   51 +
 .../default/xui/en/panel_edit_wearable.xml    |   18 +
 .../newview/skins/default/xui/en/strings.xml  |    4 +
 28 files changed, 254 insertions(+), 3472 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/floater_customize.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_edit_physics.xml

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 07418d1b5e..8310c50b1e 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -619,6 +619,19 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+
+    <key>AvatarPhysics</key>
+    <map>
+      <key>Comment</key>
+      <string>Enable avatar physics, such as breast physics.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+
     <key>BackgroundYieldTime</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index 4f64d669f5..7dd15c67c7 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -9079,8 +9079,8 @@ render_pass="bump">
      sex="female"
      name="Breast_Physics_Mass"
      label="Breast Physics Mass"
-     wearable="shape"
-     edit_group="shape_physics"
+     wearable="physics"
+     edit_group="physics"
      label_min="Less"
      label_max="More"
      value_default="1"
@@ -9097,8 +9097,8 @@ render_pass="bump">
      sex="female"
      name="Breast_Physics_Smoothing"
      label="Breast Physics Smoothing"
-     wearable="shape"
-     edit_group="shape_physics"
+     wearable="physics"
+     edit_group="physics"
      label_min="Less"
      label_max="More"
      value_default="2"
@@ -9115,8 +9115,8 @@ render_pass="bump">
      sex="female"
      name="Breast_Physics_Gravity"
      label="Breast Physics Gravity"
-     wearable="shape"
-     edit_group="shape_physics"
+     wearable="physics"
+     edit_group="physics"
      label_min="Less"
      label_max="More"
      value_default="0"
@@ -9133,8 +9133,8 @@ render_pass="bump">
      sex="female"
      name="Breast_Physics_Side_Spring"
      label="Breast Physics Side Spring"
-     wearable="shape"
-     edit_group="shape_physics"
+     wearable="physics"
+     edit_group="physics"
      label_min="Less"
      label_max="More"
      value_default="3"
@@ -9151,8 +9151,8 @@ render_pass="bump">
      sex="female"
      name="Breast_Physics_Side_Gain"
      label="Breast Physics Side Gain"
-     wearable="shape"
-     edit_group="shape_physics"
+     wearable="physics"
+     edit_group="physics"
      label_min="Less"
      label_max="More"
      value_default="10"
@@ -9169,8 +9169,8 @@ render_pass="bump">
      sex="female"
      name="Breast_Physics_Side_Damping"
      label="Breast Physics Side Damping"
-     wearable="shape"
-     edit_group="shape_physics"
+     wearable="physics"
+     edit_group="physics"
      label_min="Less"
      label_max="More"
      value_default=".5"
@@ -9187,8 +9187,8 @@ render_pass="bump">
      sex="female"
      name="Breast_Physics_Side_Drag"
      label="Breast Physics Side Drag"
-     wearable="shape"
-     edit_group="shape_physics"
+     wearable="physics"
+     edit_group="physics"
      label_min="Less"
      label_max="More"
      value_default=".1"
@@ -9205,8 +9205,8 @@ render_pass="bump">
      sex="female"
      name="Breast_Physics_Side_Range"
      label="Breast Physics Side Range"
-     wearable="shape"
-     edit_group="shape_physics"
+     wearable="physics"
+     edit_group="physics"
      label_min="Less"
      label_max="More"
      value_default="10"
@@ -9224,8 +9224,8 @@ render_pass="bump">
      sex="female"
      name="Breast_Physics_UpDown_Spring"
      label="Breast Physics UpDown Spring"
-     wearable="shape"
-     edit_group="shape_physics"
+     wearable="physics"
+     edit_group="physics"
      label_min="Less"
      label_max="More"
      value_default="1.5"
@@ -9242,8 +9242,8 @@ render_pass="bump">
      sex="female"
      name="Breast_Physics_UpDown_Gain"
      label="Breast Physics UpDown Gain"
-     wearable="shape"
-     edit_group="shape_physics"
+     wearable="physics"
+     edit_group="physics"
      label_min="Less"
      label_max="More"
      value_default="50"
@@ -9260,8 +9260,8 @@ render_pass="bump">
      sex="female"
      name="Breast_Physics_UpDown_Damping"
      label="Breast Physics UpDown Damping"
-     wearable="shape"
-     edit_group="shape_physics"
+     wearable="physics"
+     edit_group="physics"
      label_min="Less"
      label_max="More"
      value_default=".1"
@@ -9278,8 +9278,8 @@ render_pass="bump">
      sex="female"
      name="Breast_Physics_UpDown_Drag"
      label="Breast Physics UpDown Drag"
-     wearable="shape"
-     edit_group="shape_physics"
+     wearable="physics"
+     edit_group="physics"
      label_min="Less"
      label_max="More"
      value_default=".1"
@@ -9296,8 +9296,8 @@ render_pass="bump">
      sex="female"
      name="Breast_Physics_UpDown_Range"
      label="Breast Physics UpDown Range"
-     wearable="shape"
-     edit_group="shape_physics"
+     wearable="physics"
+     edit_group="physics"
      label_min="Less"
      label_max="More"
      value_default="10"
@@ -9308,6 +9308,8 @@ render_pass="bump">
 	 <param_driver />
     </param>
 
+
+
    <param
      id="1087"
      group="0"
diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index 4c2caae2c6..91a09cd886 100644
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -1717,6 +1717,7 @@ void LLAgentWearables::userRemoveAllClothesStep2(BOOL proceed)
 		gAgentWearables.removeWearable(LLWearableType::WT_SKIRT,true,0);
 		gAgentWearables.removeWearable(LLWearableType::WT_ALPHA,true,0);
 		gAgentWearables.removeWearable(LLWearableType::WT_TATTOO,true,0);
+		gAgentWearables.removeWearable(LLWearableType::WT_PHYSICS,true,0);
 	}
 }
 
@@ -2042,8 +2043,9 @@ void LLAgentWearables::editWearable(const LLUUID& item_id)
 		return;
 	}
 
+	const BOOL disable_camera_switch = LLWearableType::getDisableCameraSwitch(wearable->getType());
 	LLPanel* panel = LLSideTray::getInstance()->getPanel("sidepanel_appearance");
-	LLSidepanelAppearance::editWearable(wearable, panel);
+	LLSidepanelAppearance::editWearable(wearable, panel, disable_camera_switch);
 }
 
 // Request editing the item after it gets worn.
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index aff0bc4099..a564059b87 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -4496,6 +4496,11 @@ void LLWearableBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 						disabled_items.push_back(std::string("Take Off"));
 						disabled_items.push_back(std::string("Wearable Edit"));
 					}
+					if (gAgentWearables.isWearingWearableType(mWearableType) &&
+						!LLWearableType::getAllowMultiwear(mWearableType))
+					{
+						disabled_items.push_back(std::string("Wearable Add"));
+					}
 					break;
 				default:
 					break;
diff --git a/indra/newview/llinventoryicon.cpp b/indra/newview/llinventoryicon.cpp
index 021790648d..0574f0efe5 100644
--- a/indra/newview/llinventoryicon.cpp
+++ b/indra/newview/llinventoryicon.cpp
@@ -82,6 +82,8 @@ LLIconDictionary::LLIconDictionary()
 	addEntry(LLInventoryIcon::ICONNAME_ANIMATION, 				new IconEntry("Inv_Animation"));
 	addEntry(LLInventoryIcon::ICONNAME_GESTURE, 				new IconEntry("Inv_Gesture"));
 
+	addEntry(LLInventoryIcon::ICONNAME_CLOTHING_PHYSICS, 		new IconEntry("Inv_Physics"));
+
 	addEntry(LLInventoryIcon::ICONNAME_LINKITEM, 				new IconEntry("Inv_LinkItem"));
 	addEntry(LLInventoryIcon::ICONNAME_LINKFOLDER, 				new IconEntry("Inv_LinkItem"));
 
diff --git a/indra/newview/llinventoryicon.h b/indra/newview/llinventoryicon.h
index 3c7ac7f609..ea00206ba1 100644
--- a/indra/newview/llinventoryicon.h
+++ b/indra/newview/llinventoryicon.h
@@ -66,9 +66,11 @@ public:
 		ICONNAME_CLOTHING_SKIRT,
 		ICONNAME_CLOTHING_ALPHA,
 		ICONNAME_CLOTHING_TATTOO,
-		
+
 		ICONNAME_ANIMATION,
 		ICONNAME_GESTURE,
+
+		ICONNAME_CLOTHING_PHYSICS,
 		
 		ICONNAME_LINKITEM,
 		ICONNAME_LINKFOLDER,
diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp
index bfe3aa0e61..baccb9a807 100644
--- a/indra/newview/llpaneleditwearable.cpp
+++ b/indra/newview/llpaneleditwearable.cpp
@@ -72,7 +72,6 @@ enum ESubpart {
 	SUBPART_SHAPE_MOUTH,
 	SUBPART_SHAPE_CHIN,
 	SUBPART_SHAPE_TORSO,
-	SUBPART_SHAPE_PHYSICS,
 	SUBPART_SHAPE_LEGS,
 	SUBPART_SHAPE_WHOLE,
 	SUBPART_SHAPE_DETAIL,
@@ -95,7 +94,8 @@ enum ESubpart {
 	SUBPART_UNDERPANTS,
 	SUBPART_SKIRT,
 	SUBPART_ALPHA,
-	SUBPART_TATTOO
+	SUBPART_TATTOO,
+	SUBPART_PHYSICS
  };
 
 using namespace LLVOAvatarDefines;
@@ -219,7 +219,7 @@ LLEditWearableDictionary::Wearables::Wearables()
 	// note the subpart that is listed first is treated as "default", regardless of what order is in enum.
 	// Please match the order presented in XUI. -Nyx
 	// this will affect what camera angle is shown when first editing a wearable
-	addEntry(LLWearableType::WT_SHAPE, 		new WearableEntry(LLWearableType::WT_SHAPE,"edit_shape_title","shape_desc_text",0,0,10,	SUBPART_SHAPE_WHOLE, SUBPART_SHAPE_HEAD,	SUBPART_SHAPE_EYES,	SUBPART_SHAPE_EARS,	SUBPART_SHAPE_NOSE,	SUBPART_SHAPE_MOUTH, SUBPART_SHAPE_CHIN, SUBPART_SHAPE_TORSO, SUBPART_SHAPE_LEGS, SUBPART_SHAPE_PHYSICS));
+	addEntry(LLWearableType::WT_SHAPE, 		new WearableEntry(LLWearableType::WT_SHAPE,"edit_shape_title","shape_desc_text",0,0,9,	SUBPART_SHAPE_WHOLE, SUBPART_SHAPE_HEAD,	SUBPART_SHAPE_EYES,	SUBPART_SHAPE_EARS,	SUBPART_SHAPE_NOSE,	SUBPART_SHAPE_MOUTH, SUBPART_SHAPE_CHIN, SUBPART_SHAPE_TORSO, SUBPART_SHAPE_LEGS));
 	addEntry(LLWearableType::WT_SKIN, 		new WearableEntry(LLWearableType::WT_SKIN,"edit_skin_title","skin_desc_text",0,3,4, TEX_HEAD_BODYPAINT, TEX_UPPER_BODYPAINT, TEX_LOWER_BODYPAINT, SUBPART_SKIN_COLOR, SUBPART_SKIN_FACEDETAIL, SUBPART_SKIN_MAKEUP, SUBPART_SKIN_BODYDETAIL));
 	addEntry(LLWearableType::WT_HAIR, 		new WearableEntry(LLWearableType::WT_HAIR,"edit_hair_title","hair_desc_text",0,1,4, TEX_HAIR, SUBPART_HAIR_COLOR,	SUBPART_HAIR_STYLE,	SUBPART_HAIR_EYEBROWS, SUBPART_HAIR_FACIAL));
 	addEntry(LLWearableType::WT_EYES, 		new WearableEntry(LLWearableType::WT_EYES,"edit_eyes_title","eyes_desc_text",0,1,1, TEX_EYES_IRIS, SUBPART_EYES));
@@ -234,6 +234,7 @@ LLEditWearableDictionary::Wearables::Wearables()
 	addEntry(LLWearableType::WT_SKIRT, 		new WearableEntry(LLWearableType::WT_SKIRT,"edit_skirt_title","skirt_desc_text",1,1,1, TEX_SKIRT, TEX_SKIRT, SUBPART_SKIRT));
 	addEntry(LLWearableType::WT_ALPHA, 		new WearableEntry(LLWearableType::WT_ALPHA,"edit_alpha_title","alpha_desc_text",0,5,1, TEX_LOWER_ALPHA, TEX_UPPER_ALPHA, TEX_HEAD_ALPHA, TEX_EYES_ALPHA, TEX_HAIR_ALPHA, SUBPART_ALPHA));
 	addEntry(LLWearableType::WT_TATTOO, 	new WearableEntry(LLWearableType::WT_TATTOO,"edit_tattoo_title","tattoo_desc_text",1,3,1, TEX_HEAD_TATTOO, TEX_LOWER_TATTOO, TEX_UPPER_TATTOO, TEX_HEAD_TATTOO, SUBPART_TATTOO));
+	addEntry(LLWearableType::WT_PHYSICS, 	new WearableEntry(LLWearableType::WT_PHYSICS,"edit_physics_title","physics_desc_text",0,0,1, SUBPART_PHYSICS));
 }
 
 LLEditWearableDictionary::WearableEntry::WearableEntry(LLWearableType::EType type,
@@ -279,7 +280,6 @@ LLEditWearableDictionary::Subparts::Subparts()
 	addEntry(SUBPART_SHAPE_MOUTH, new SubpartEntry(SUBPART_SHAPE_MOUTH, "mHead", "shape_mouth", "shape_mouth_param_list", "shape_mouth_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
 	addEntry(SUBPART_SHAPE_CHIN, new SubpartEntry(SUBPART_SHAPE_CHIN, "mHead", "shape_chin", "shape_chin_param_list", "shape_chin_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
 	addEntry(SUBPART_SHAPE_TORSO, new SubpartEntry(SUBPART_SHAPE_TORSO, "mTorso", "shape_torso", "shape_torso_param_list", "shape_torso_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(-1.f, 0.15f, 0.3f),SEX_BOTH));
-	addEntry(SUBPART_SHAPE_PHYSICS, new SubpartEntry(SUBPART_SHAPE_PHYSICS, "mTorso", "shape_physics", "shape_physics_param_list", "shape_physics_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(-1.f, 0.15f, 0.3f),SEX_FEMALE));
 	addEntry(SUBPART_SHAPE_LEGS, new SubpartEntry(SUBPART_SHAPE_LEGS, "mPelvis", "shape_legs", "shape_legs_param_list", "shape_legs_tab", LLVector3d(0.f, 0.f, -0.5f), LLVector3d(-1.6f, 0.15f, -0.5f),SEX_BOTH));
 
 	addEntry(SUBPART_SKIN_COLOR, new SubpartEntry(SUBPART_SKIN_COLOR, "mHead", "skin_color", "skin_color_param_list", "skin_color_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
@@ -305,6 +305,7 @@ LLEditWearableDictionary::Subparts::Subparts()
 	addEntry(SUBPART_UNDERPANTS, new SubpartEntry(SUBPART_UNDERPANTS, "mPelvis", "underpants", "underpants_main_param_list", "underpants_main_tab", LLVector3d(0.f, 0.f, -0.5f), LLVector3d(-1.6f, 0.15f, -0.5f),SEX_BOTH));
 	addEntry(SUBPART_ALPHA, new SubpartEntry(SUBPART_ALPHA, "mPelvis", "alpha", "alpha_main_param_list", "alpha_main_tab", LLVector3d(0.f, 0.f, 0.1f), LLVector3d(-2.5f, 0.5f, 0.8f),SEX_BOTH));
 	addEntry(SUBPART_TATTOO, new SubpartEntry(SUBPART_TATTOO, "mPelvis", "tattoo", "tattoo_main_param_list", "tattoo_main_tab", LLVector3d(0.f, 0.f, 0.1f), LLVector3d(-2.5f, 0.5f, 0.8f),SEX_BOTH));
+	addEntry(SUBPART_PHYSICS, new SubpartEntry(SUBPART_PHYSICS, "mTorso", "physics", "physics_main_param_list", "physics_main_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(-1.f, 0.15f, 0.3f),SEX_FEMALE));
 }
 
 LLEditWearableDictionary::SubpartEntry::SubpartEntry(ESubpart part,
@@ -741,6 +742,7 @@ BOOL LLPanelEditWearable::postBuild()
 	mPanelSkirt = getChild<LLPanel>("edit_skirt_panel");
 	mPanelAlpha = getChild<LLPanel>("edit_alpha_panel");
 	mPanelTattoo = getChild<LLPanel>("edit_tattoo_panel");
+	mPanelPhysics = getChild<LLPanel>("edit_physics_panel");
 
 	mTxtAvatarHeight = mPanelShape->getChild<LLTextBox>("avatar_height");
 
@@ -1360,6 +1362,11 @@ LLPanel* LLPanelEditWearable::getPanel(LLWearableType::EType type)
 		case LLWearableType::WT_TATTOO:
 			return mPanelTattoo;
 			break;
+
+		case LLWearableType::WT_PHYSICS:
+			return mPanelPhysics;
+			break;
+
 		default:
 			break;
 	}
diff --git a/indra/newview/llpaneleditwearable.h b/indra/newview/llpaneleditwearable.h
index 623101d835..692a7ce90f 100644
--- a/indra/newview/llpaneleditwearable.h
+++ b/indra/newview/llpaneleditwearable.h
@@ -163,6 +163,7 @@ private:
 	LLPanel *mPanelSkirt;
 	LLPanel *mPanelAlpha;
 	LLPanel *mPanelTattoo;
+	LLPanel *mPanelPhysics;
 
 	typedef std::map<std::string, LLVOAvatarDefines::ETextureIndex> string_texture_index_map_t;
 	string_texture_index_map_t mAlphaCheckbox2Index;
diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp
index c9380bf6e6..4a87249257 100644
--- a/indra/newview/llpaneloutfitedit.cpp
+++ b/indra/newview/llpaneloutfitedit.cpp
@@ -466,6 +466,7 @@ BOOL LLPanelOutfitEdit::postBuild()
 	mListViewItemTypes.push_back(new LLFilterItem(LLTrans::getString("skirt"), new LLFindActualWearablesOfType(LLWearableType::WT_SKIRT)));
 	mListViewItemTypes.push_back(new LLFilterItem(LLTrans::getString("alpha"), new LLFindActualWearablesOfType(LLWearableType::WT_ALPHA)));
 	mListViewItemTypes.push_back(new LLFilterItem(LLTrans::getString("tattoo"), new LLFindActualWearablesOfType(LLWearableType::WT_TATTOO)));
+	mListViewItemTypes.push_back(new LLFilterItem(LLTrans::getString("physics"), new LLFindActualWearablesOfType(LLWearableType::WT_PHYSICS)));
 
 	mCurrentOutfitName = getChild<LLTextBox>("curr_outfit_name"); 
 	mStatus = getChild<LLTextBox>("status");
diff --git a/indra/newview/llpaneloutfitedit.h b/indra/newview/llpaneloutfitedit.h
index 2dca986e33..f420930acd 100644
--- a/indra/newview/llpaneloutfitedit.h
+++ b/indra/newview/llpaneloutfitedit.h
@@ -96,6 +96,7 @@ public:
 		LVIT_SKIRT,
 		LVIT_ALPHA,
 		LVIT_TATTOO,
+		LVIT_PHYSICS,
 		NUM_LIST_VIEW_ITEM_TYPES
 	} EListViewItemType; 
 
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp
index 333a463844..cd6f87f615 100644
--- a/indra/newview/llsidepanelappearance.cpp
+++ b/indra/newview/llsidepanelappearance.cpp
@@ -434,14 +434,14 @@ void LLSidepanelAppearance::refreshCurrentOutfitName(const std::string& name)
 }
 
 //static
-void LLSidepanelAppearance::editWearable(LLWearable *wearable, LLView *data)
+void LLSidepanelAppearance::editWearable(LLWearable *wearable, LLView *data, BOOL disable_camera_switch)
 {
 	LLSideTray::getInstance()->showPanel("sidepanel_appearance");
 
 	LLSidepanelAppearance *panel = dynamic_cast<LLSidepanelAppearance*>(data);
 	if (panel)
 	{
-		panel->showWearableEditPanel(wearable);
+		panel->showWearableEditPanel(wearable, disable_camera_switch);
 	}
 }
 
diff --git a/indra/newview/llsidepanelappearance.h b/indra/newview/llsidepanelappearance.h
index 022280132e..70c8b7b797 100644
--- a/indra/newview/llsidepanelappearance.h
+++ b/indra/newview/llsidepanelappearance.h
@@ -51,7 +51,7 @@ public:
 
 	void refreshCurrentOutfitName(const std::string& name = "");
 
-	static void editWearable(LLWearable *wearable, LLView *data);
+	static void editWearable(LLWearable *wearable, LLView *data, BOOL disable_camera_switch = FALSE);
 
 	void fetchInventory();
 	void inventoryFetched();
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 75a5b14154..fc9f3aecf3 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -85,6 +85,7 @@ public:
 		mInventoryItemsDict["New Skirt"]		= LLTrans::getString("New Skirt");
 		mInventoryItemsDict["New Alpha"]		= LLTrans::getString("New Alpha");
 		mInventoryItemsDict["New Tattoo"]		= LLTrans::getString("New Tattoo");
+		mInventoryItemsDict["New Physics"]		= LLTrans::getString("New Physics");
 		mInventoryItemsDict["Invalid Wearable"] = LLTrans::getString("Invalid Wearable");
 
 		mInventoryItemsDict["New Gesture"]		= LLTrans::getString("New Gesture");
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 0f5df8ce12..80b10cc05e 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -103,7 +103,7 @@ extern F32 ANIM_SPEED_MIN;
 
 #include <boost/lexical_cast.hpp>
 
-#define OUTPUT_BREAST_DATA
+// #define OUTPUT_BREAST_DATA
 
 using namespace LLVOAvatarDefines;
 
@@ -787,6 +787,11 @@ public:
 	// must return FALSE when the motion is completed.
 	virtual BOOL onUpdate(F32 time, U8* joint_mask)
 	{
+		if (!gSavedSettings.getBOOL("AvatarPhysics"))
+		{
+			return FALSE;
+		}
+
 		/*
 		FILE *fread = fopen("c:\\temp\\breast_data.txt","r");
 		if (fread)
diff --git a/indra/newview/llwearableitemslist.cpp b/indra/newview/llwearableitemslist.cpp
index a49dc1b59d..b777885f79 100644
--- a/indra/newview/llwearableitemslist.cpp
+++ b/indra/newview/llwearableitemslist.cpp
@@ -443,6 +443,7 @@ clothing_to_string_map_t init_clothing_string_map()
 	w_map.insert(std::make_pair(LLWearableType::WT_SKIRT, "skirt_not_worn"));
 	w_map.insert(std::make_pair(LLWearableType::WT_ALPHA, "alpha_not_worn"));
 	w_map.insert(std::make_pair(LLWearableType::WT_TATTOO, "tattoo_not_worn"));
+	w_map.insert(std::make_pair(LLWearableType::WT_PHYSICS, "physics_not_worn"));
 	return w_map;
 }
 
diff --git a/indra/newview/llwearabletype.cpp b/indra/newview/llwearabletype.cpp
index d2e62c86ab..bb1ed61f40 100644
--- a/indra/newview/llwearabletype.cpp
+++ b/indra/newview/llwearabletype.cpp
@@ -34,25 +34,27 @@ struct WearableEntry : public LLDictionaryEntry
 	WearableEntry(const std::string &name,
 				  const std::string& default_new_name,
 				  LLAssetType::EType assetType,
-				  LLInventoryIcon::EIconName iconName);
+				  LLInventoryIcon::EIconName iconName,
+				  BOOL disable_camera_switch = FALSE,
+				  BOOL allow_multiwear = TRUE) :
+		LLDictionaryEntry(name),
+		mAssetType(assetType),
+		mDefaultNewName(default_new_name),
+		mLabel(LLTrans::getString(name)),
+		mIconName(iconName),
+		mDisableCameraSwitch(disable_camera_switch),
+		mAllowMultiwear(allow_multiwear)
+	{
+		
+	}
 	const LLAssetType::EType mAssetType;
 	const std::string mLabel;
 	const std::string mDefaultNewName; //keep mLabel for backward compatibility
 	LLInventoryIcon::EIconName mIconName;
+	BOOL mDisableCameraSwitch;
+	BOOL mAllowMultiwear;
 };
 
-WearableEntry::WearableEntry(const std::string &name,
-							 const std::string& default_new_name,
-							 LLAssetType::EType assetType,
-							 LLInventoryIcon::EIconName iconName) :
-	LLDictionaryEntry(name),
-	mAssetType(assetType),
-	mDefaultNewName(default_new_name),
-	mLabel(LLTrans::getString(name)),
-	mIconName(iconName)
-{
-}
-
 class LLWearableDictionary : public LLSingleton<LLWearableDictionary>,
 							 public LLDictionary<LLWearableType::EType, WearableEntry>
 {
@@ -62,23 +64,26 @@ public:
 
 LLWearableDictionary::LLWearableDictionary()
 {
-	addEntry(LLWearableType::WT_SHAPE,        new WearableEntry("shape",       "New Shape",			LLAssetType::AT_BODYPART, 	LLInventoryIcon::ICONNAME_BODYPART_SHAPE));
-	addEntry(LLWearableType::WT_SKIN,         new WearableEntry("skin",        "New Skin",			LLAssetType::AT_BODYPART, 	LLInventoryIcon::ICONNAME_BODYPART_SKIN));
-	addEntry(LLWearableType::WT_HAIR,         new WearableEntry("hair",        "New Hair",			LLAssetType::AT_BODYPART, 	LLInventoryIcon::ICONNAME_BODYPART_HAIR));
-	addEntry(LLWearableType::WT_EYES,         new WearableEntry("eyes",        "New Eyes",			LLAssetType::AT_BODYPART, 	LLInventoryIcon::ICONNAME_BODYPART_EYES));
-	addEntry(LLWearableType::WT_SHIRT,        new WearableEntry("shirt",       "New Shirt",			LLAssetType::AT_CLOTHING, 	LLInventoryIcon::ICONNAME_CLOTHING_SHIRT));
-	addEntry(LLWearableType::WT_PANTS,        new WearableEntry("pants",       "New Pants",			LLAssetType::AT_CLOTHING, 	LLInventoryIcon::ICONNAME_CLOTHING_PANTS));
-	addEntry(LLWearableType::WT_SHOES,        new WearableEntry("shoes",       "New Shoes",			LLAssetType::AT_CLOTHING, 	LLInventoryIcon::ICONNAME_CLOTHING_SHOES));
-	addEntry(LLWearableType::WT_SOCKS,        new WearableEntry("socks",       "New Socks",			LLAssetType::AT_CLOTHING, 	LLInventoryIcon::ICONNAME_CLOTHING_SOCKS));
-	addEntry(LLWearableType::WT_JACKET,       new WearableEntry("jacket",      "New Jacket",		LLAssetType::AT_CLOTHING, 	LLInventoryIcon::ICONNAME_CLOTHING_JACKET));
-	addEntry(LLWearableType::WT_GLOVES,       new WearableEntry("gloves",      "New Gloves",		LLAssetType::AT_CLOTHING, 	LLInventoryIcon::ICONNAME_CLOTHING_GLOVES));
-	addEntry(LLWearableType::WT_UNDERSHIRT,   new WearableEntry("undershirt",  "New Undershirt",	LLAssetType::AT_CLOTHING, 	LLInventoryIcon::ICONNAME_CLOTHING_UNDERSHIRT));
-	addEntry(LLWearableType::WT_UNDERPANTS,   new WearableEntry("underpants",  "New Underpants",	LLAssetType::AT_CLOTHING, 	LLInventoryIcon::ICONNAME_CLOTHING_UNDERPANTS));
-	addEntry(LLWearableType::WT_SKIRT,        new WearableEntry("skirt",       "New Skirt",			LLAssetType::AT_CLOTHING, 	LLInventoryIcon::ICONNAME_CLOTHING_SKIRT));
-	addEntry(LLWearableType::WT_ALPHA,        new WearableEntry("alpha",       "New Alpha",			LLAssetType::AT_CLOTHING, 	LLInventoryIcon::ICONNAME_CLOTHING_ALPHA));
-	addEntry(LLWearableType::WT_TATTOO,       new WearableEntry("tattoo",      "New Tattoo",		LLAssetType::AT_CLOTHING, 	LLInventoryIcon::ICONNAME_CLOTHING_TATTOO));
-	addEntry(LLWearableType::WT_INVALID,      new WearableEntry("invalid",     "Invalid Wearable", 	LLAssetType::AT_NONE, 		LLInventoryIcon::ICONNAME_NONE));
-	addEntry(LLWearableType::WT_NONE,      	  new WearableEntry("none",        "Invalid Wearable", 	LLAssetType::AT_NONE, 		LLInventoryIcon::ICONNAME_NONE));
+	addEntry(LLWearableType::WT_SHAPE,        new WearableEntry("shape",       "New Shape",			LLAssetType::AT_BODYPART, 	LLInventoryIcon::ICONNAME_BODYPART_SHAPE, FALSE, FALSE));
+	addEntry(LLWearableType::WT_SKIN,         new WearableEntry("skin",        "New Skin",			LLAssetType::AT_BODYPART, 	LLInventoryIcon::ICONNAME_BODYPART_SKIN, FALSE, FALSE));
+	addEntry(LLWearableType::WT_HAIR,         new WearableEntry("hair",        "New Hair",			LLAssetType::AT_BODYPART, 	LLInventoryIcon::ICONNAME_BODYPART_HAIR, FALSE, FALSE));
+	addEntry(LLWearableType::WT_EYES,         new WearableEntry("eyes",        "New Eyes",			LLAssetType::AT_BODYPART, 	LLInventoryIcon::ICONNAME_BODYPART_EYES, FALSE, FALSE));
+	addEntry(LLWearableType::WT_SHIRT,        new WearableEntry("shirt",       "New Shirt",			LLAssetType::AT_CLOTHING, 	LLInventoryIcon::ICONNAME_CLOTHING_SHIRT, FALSE, TRUE));
+	addEntry(LLWearableType::WT_PANTS,        new WearableEntry("pants",       "New Pants",			LLAssetType::AT_CLOTHING, 	LLInventoryIcon::ICONNAME_CLOTHING_PANTS, FALSE, TRUE));
+	addEntry(LLWearableType::WT_SHOES,        new WearableEntry("shoes",       "New Shoes",			LLAssetType::AT_CLOTHING, 	LLInventoryIcon::ICONNAME_CLOTHING_SHOES, FALSE, TRUE));
+	addEntry(LLWearableType::WT_SOCKS,        new WearableEntry("socks",       "New Socks",			LLAssetType::AT_CLOTHING, 	LLInventoryIcon::ICONNAME_CLOTHING_SOCKS, FALSE, TRUE));
+	addEntry(LLWearableType::WT_JACKET,       new WearableEntry("jacket",      "New Jacket",		LLAssetType::AT_CLOTHING, 	LLInventoryIcon::ICONNAME_CLOTHING_JACKET, FALSE, TRUE));
+	addEntry(LLWearableType::WT_GLOVES,       new WearableEntry("gloves",      "New Gloves",		LLAssetType::AT_CLOTHING, 	LLInventoryIcon::ICONNAME_CLOTHING_GLOVES, FALSE, TRUE));
+	addEntry(LLWearableType::WT_UNDERSHIRT,   new WearableEntry("undershirt",  "New Undershirt",	LLAssetType::AT_CLOTHING, 	LLInventoryIcon::ICONNAME_CLOTHING_UNDERSHIRT, FALSE, TRUE));
+	addEntry(LLWearableType::WT_UNDERPANTS,   new WearableEntry("underpants",  "New Underpants",	LLAssetType::AT_CLOTHING, 	LLInventoryIcon::ICONNAME_CLOTHING_UNDERPANTS, FALSE, TRUE));
+	addEntry(LLWearableType::WT_SKIRT,        new WearableEntry("skirt",       "New Skirt",			LLAssetType::AT_CLOTHING, 	LLInventoryIcon::ICONNAME_CLOTHING_SKIRT, FALSE, TRUE));
+	addEntry(LLWearableType::WT_ALPHA,        new WearableEntry("alpha",       "New Alpha",			LLAssetType::AT_CLOTHING, 	LLInventoryIcon::ICONNAME_CLOTHING_ALPHA, FALSE, TRUE));
+	addEntry(LLWearableType::WT_TATTOO,       new WearableEntry("tattoo",      "New Tattoo",		LLAssetType::AT_CLOTHING, 	LLInventoryIcon::ICONNAME_CLOTHING_TATTOO, FALSE, TRUE));
+
+	addEntry(LLWearableType::WT_PHYSICS,      new WearableEntry("physics",     "New Physics",		LLAssetType::AT_CLOTHING, 	LLInventoryIcon::ICONNAME_CLOTHING_PHYSICS, TRUE, FALSE));
+
+	addEntry(LLWearableType::WT_INVALID,      new WearableEntry("invalid",     "Invalid Wearable", 	LLAssetType::AT_NONE, 		LLInventoryIcon::ICONNAME_NONE, FALSE, FALSE));
+	addEntry(LLWearableType::WT_NONE,      	  new WearableEntry("none",        "Invalid Wearable", 	LLAssetType::AT_NONE, 		LLInventoryIcon::ICONNAME_NONE, FALSE, FALSE));
 }
 
 // static
@@ -129,3 +134,19 @@ LLInventoryIcon::EIconName LLWearableType::getIconName(LLWearableType::EType typ
 	return entry->mIconName;
 }
 
+// static 
+BOOL LLWearableType::getDisableCameraSwitch(LLWearableType::EType type)
+{
+	const LLWearableDictionary *dict = LLWearableDictionary::getInstance();
+	const WearableEntry *entry = dict->lookup(type);
+	return entry->mDisableCameraSwitch;
+}
+
+// static 
+BOOL LLWearableType::getAllowMultiwear(LLWearableType::EType type)
+{
+	const LLWearableDictionary *dict = LLWearableDictionary::getInstance();
+	const WearableEntry *entry = dict->lookup(type);
+	return entry->mAllowMultiwear;
+}
+
diff --git a/indra/newview/llwearabletype.h b/indra/newview/llwearabletype.h
index 3bbf8ba0bd..d633b4807e 100644
--- a/indra/newview/llwearabletype.h
+++ b/indra/newview/llwearabletype.h
@@ -52,7 +52,8 @@ public:
 		WT_SKIRT	  = 12,
 		WT_ALPHA	  = 13,
 		WT_TATTOO	  = 14,
-		WT_COUNT	  = 15,
+		WT_PHYSICS	  = 15,
+		WT_COUNT	  = 16,
 
 		WT_INVALID	  = 255,
 		WT_NONE		  = -1,
@@ -64,6 +65,8 @@ public:
 	static LLAssetType::EType 			getAssetType(EType type);
 	static EType 						typeNameToType(const std::string& type_name);
 	static LLInventoryIcon::EIconName 	getIconName(EType type);
+	static BOOL 						getDisableCameraSwitch(EType type);
+	static BOOL 						getAllowMultiwear(EType type);
 
 protected:
 	LLWearableType() {}
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 082b37d80b..65d86403f2 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -223,6 +223,7 @@ with the same filename but different name
   <texture name="Inv_SysClosed" file_name="icons/Inv_SysClosed.png" preload="false" />
   <texture name="Inv_SysOpen" file_name="icons/Inv_SysOpen.png" preload="false" />
   <texture name="Inv_Tattoo" file_name="icons/Inv_Tattoo.png" preload="false" />
+  <texture name="Inv_Physics" file_name="icons/Inv_Physics.png" preload="false" />
   <texture name="Inv_Texture" file_name="icons/Inv_Texture.png" preload="false" />
   <texture name="Inv_TrashClosed" file_name="icons/Inv_TrashClosed.png" preload="false" />
   <texture name="Inv_TrashOpen" file_name="icons/Inv_TrashOpen.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml
deleted file mode 100644
index 01bced81d0..0000000000
--- a/indra/newview/skins/default/xui/en/floater_customize.xml
+++ /dev/null
@@ -1,3389 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- can_minimize="false"
- follows="left|top"
- height="583"
- layout="topleft"
- left_delta="-3"
- name="floater customize"
- help_topic="floater_customize"
- save_rect="true"
- title="APPEARANCE"
- top_delta="-185"
- width="600">
-    <tab_container
-     height="517"
-     layout="topleft"
-     left="10"
-     name="customize tab container"
-     tab_min_width="96"
-     tab_position="left"
-     tab_height="50"
-     top="26"
-     width="580">
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="16"
-             layout="topleft"
-             left="5"
-             name="body_parts_placeholder"
-	     font="SansSerifSmallBold"
-             top="10"
-             width="100">
-                Body Parts
-            </text>
-	    <placeholder />
-        <panel
-         border="false"
- background_visible="true"
- bg_alpha_color="DkGray2"
-         follows="left|top|right|bottom"
-         height="508"
-         label="Shape"
-         layout="topleft"
-         name="Shape"
-         help_topic="customize_shape_tab"
-         width="400">
-            <icon
-             follows="top|right"
-             height="18"
-             image_name="Lock"
-             layout="topleft"
-             left="315"
-             mouse_opaque="true"
-             name="square"
-             top="4"
-             width="18" />
-            <icon
-             height="16"
-	     top="10"
-	     left="10"
-             layout="topleft"
-             mouse_opaque="true"
-             width="16" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Shape"
-             label_selected="Create New Shape"
-             layout="topleft"
-             left="10"
-             name="Create New"
-             top="104"
-             width="160" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Body"
-             label_selected="Body"
-             layout="topleft"
-             left="10"
-             name="Body"
-             top="63"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Head"
-             label_selected="Head"
-             layout="topleft"
-             left_delta="0"
-             name="Head"
-             top_pad="4"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Eyes"
-             label_selected="Eyes"
-             layout="topleft"
-             left_delta="0"
-             name="Eyes"
-             top_pad="4"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Ears"
-             label_selected="Ears"
-             layout="topleft"
-             left_delta="0"
-             name="Ears"
-             top_pad="4"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Nose"
-             label_selected="Nose"
-             layout="topleft"
-             left_delta="0"
-             name="Nose"
-             top_pad="4"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Mouth"
-             label_selected="Mouth"
-             layout="topleft"
-             left_delta="0"
-             name="Mouth"
-             top_pad="4"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Chin"
-             label_selected="Chin"
-             layout="topleft"
-             left_delta="0"
-             name="Chin"
-             top_pad="4"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Torso"
-             label_selected="Torso"
-             layout="topleft"
-             left_delta="0"
-             name="Torso"
-             top_pad="4"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Legs"
-             label_selected="Legs"
-             layout="topleft"
-             left_delta="0"
-             name="Legs"
-             top_pad="4"
-             width="82" />
-            <radio_group
-             control_name="AvatarSex"
-             height="34"
-             layout="topleft"
-             name="sex radio"
-	     top_pad="10"
-             width="82">
-                <radio_item
-                 height="16"
-                 label="Female"
-                 layout="topleft"
-                 name="radio"
-                 value="0"
-                 width="82" />
-                <radio_item
-                 height="16"
-                 label="Male"
-                 layout="topleft"
-                 name="radio2"
-                 value="1"
-                 width="82" />
-            </radio_group>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title"
-             top="10"
-             width="355">
-                [DESC]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_no_modify"
-             top="10"
-             width="355">
-                [DESC]: cannot modify
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_loading"
-             top="10"
-             width="355">
-                [DESC]: loading...
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_not_worn"
-             top="10"
-             width="355">
-                [DESC]: not worn
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="16"
-             layout="topleft"
-             left="10"
-             name="path"
-             top="36"
-             width="373">
-                Located in [PATH]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="not worn instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                Put on a new shape by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="no modify instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                You do not have permission to modify this wearable.
-            </text>
-            <text
-             type="string"
-             length="1"
-             top="488"
-             follows="left|top"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="topleft"
-             left="10"
-             name="Item Action Label"
-             width="130">
-                Shape:
-            </text>
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save"
-             label_selected="Save"
-             layout="topleft"
-             name="Save"
-             left_pad="2"
-             top="477"
-             width="82" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save As..."
-             label_selected="Save As..."
-             layout="topleft"
-             name="Save As"
-             top="477"
-             left_pad="3"
-             width="115" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Revert"
-             label_selected="Revert"
-             layout="topleft"
-             left_pad="3"
-             name="Revert"
-             top="477"
-             width="120" />
-        </panel>
-        <panel
-         border="false"
- background_visible="true"
- bg_alpha_color="DkGray2"
-         follows="left|top|right|bottom"
-         height="508"
-         label="Skin"
-         layout="topleft"
-         name="Skin"
-         help_topic="customize_skin_tab"
-         width="400">
-            <icon
-             follows="top|right"
-             height="18"
-             image_name="Lock"
-             layout="topleft"
-             left="315"
-             mouse_opaque="true"
-             name="square"
-             top="4"
-             width="18" />
-            <icon
-             height="16"
-	     top="10"
-	     left="10"
-             layout="topleft"
-             mouse_opaque="true"
-             width="16" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Skin"
-             label_selected="Create New Skin"
-             layout="topleft"
-             left_delta="0"
-             name="Create New"
-             top_delta="-249"
-             width="160" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Skin Color"
-             label_selected="Skin Color"
-             layout="topleft"
-             left="10"
-             name="Skin Color"
-             top="63"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Face Detail"
-             label_selected="Face Detail"
-             layout="topleft"
-             left_delta="0"
-             name="Face Detail"
-             top_pad="4"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Makeup"
-             label_selected="Makeup"
-             layout="topleft"
-             left_delta="0"
-             name="Makeup"
-             top_pad="4"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Body Detail"
-             label_selected="Body Detail"
-             layout="topleft"
-             left_delta="0"
-             name="Body Detail"
-             top_pad="4"
-             width="82" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title"
-             top="10"
-             width="355">
-                [DESC]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_no_modify"
-             top="10"
-             width="355">
-                [DESC]: cannot modify
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_loading"
-             top="10"
-             width="355">
-                [DESC]: loading...
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_not_worn"
-             top="10"
-             width="355">
-                [DESC]: not worn
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="14"
-             layout="topleft"
-             left="10"
-             name="path"
-             top="36"
-             width="373">
-                Located in [PATH]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="not worn instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                Put on a new skin by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="no modify instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                You do not have permission to modify this wearable.
-            </text>
-            <texture_picker
-             allow_no_texture="true"
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Head Tattoos"
-             layout="topleft"
-             left="10"
-             name="Head Tattoos"
-             tool_tip="Click to choose a picture"
-             top="176"
-             width="82" />
-            <texture_picker
-             allow_no_texture="true"
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Upper Tattoos"
-             layout="topleft"
-             left_delta="0"
-             name="Upper Tattoos"
-             tool_tip="Click to choose a picture"
-             top_delta="102"
-             width="82" />
-            <texture_picker
-             allow_no_texture="true"
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Lower Tattoos"
-             layout="topleft"
-             left_delta="0"
-             name="Lower Tattoos"
-             tool_tip="Click to choose a picture"
-             top_delta="102"
-             width="82" />
-            <text
-             type="string"
-             length="1"
-             top="488"
-             follows="left|top"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="topleft"
-             left="10"
-             name="Item Action Label"
-             width="130">
-                Skin:
-            </text>
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save"
-             label_selected="Save"
-             layout="topleft"
-             left_pad="2"
-             name="Save"
-             top="477"
-             width="82" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save As..."
-             label_selected="Save As..."
-             layout="topleft"
-             left_pad="3"
-             name="Save As"
-             top="477"
-             width="115" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Revert"
-             label_selected="Revert"
-             layout="topleft"
-             left_pad="3"
-             name="Revert"
-             top="477"
-             width="120" />
-        </panel>
-        <panel
-         border="false"
- background_visible="true"
- bg_alpha_color="DkGray2"
-         follows="left|top|right|bottom"
-         height="508"
-         label="Hair"
-         layout="topleft"
-         name="Hair"
-         help_topic="customize_hair_tab"
-         width="400">
-            <icon
-             follows="top|right"
-             height="18"
-             image_name="Lock"
-             layout="topleft"
-             left="315"
-             mouse_opaque="true"
-             name="square"
-             top="4"
-             width="18" />
-            <icon
-             height="16"
-	     top="10"
-	     left="10"
-             layout="topleft"
-             mouse_opaque="true"
-             width="16" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Color"
-             label_selected="Color"
-             layout="topleft"
-             left="10"
-             name="Color"
-             top="63"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Style"
-             label_selected="Style"
-             layout="topleft"
-             left_delta="0"
-             name="Style"
-             top_pad="4"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Eyebrows"
-             label_selected="Eyebrows"
-             layout="topleft"
-             name="Eyebrows"
-             top_pad="4"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Facial"
-             label_selected="Facial"
-             layout="topleft"
-             name="Facial"
-             top_pad="4"
-             width="82" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title"
-             top="10"
-             width="355">
-                [DESC]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_no_modify"
-             top="10"
-             width="355">
-                [DESC]: cannot modify
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_loading"
-             top="10"
-             width="355">
-                [DESC]: loading...
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_not_worn"
-             top="10"
-             width="355">
-                [DESC]: not worn
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="14"
-             layout="topleft"
-             left="10"
-             name="path"
-             top="36"
-             width="373">
-                Located in [PATH]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="not worn instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                Put on a new hair by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="no modify instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                You do not have permission to modify this wearable.
-            </text>
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Texture"
-             layout="topleft"
-             left="10"
-             name="Texture"
-             tool_tip="Click to choose a picture"
-             top="176"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Hair"
-             label_selected="Create New Hair"
-             layout="topleft"
-             left_delta="0"
-             name="Create New"
-             top_delta="-89"
-             width="160" />
-            <text
-             type="string"
-             length="1"
-             top="488"
-             follows="left|top"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="topleft"
-             name="Item Action Label"
-             left="10"
-             width="130">
-                Hair:
-            </text>
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save"
-             label_selected="Save"
-             layout="topleft"
-             left_pad="2"
-             name="Save"
-             top="477"
-             width="82" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save As..."
-             label_selected="Save As..."
-             layout="topleft"
-             left_pad="3"
-             name="Save As"
-             top="477"
-             width="115" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Revert"
-             label_selected="Revert"
-             layout="topleft"
-             left_pad="3"
-             name="Revert"
-             top="477"
-             width="120" />
-        </panel>
-        <panel
-         border="false"
- background_visible="true"
- bg_alpha_color="DkGray2"
-         follows="left|top|right|bottom"
-         height="508"
-         label="Eyes"
-         layout="topleft"
-         name="Eyes"
-         help_topic="customize_eyes_tab"
-         width="400">
-            <icon
-             follows="top|right"
-             height="18"
-             image_name="Lock"
-             layout="topleft"
-             left="315"
-             mouse_opaque="true"
-             name="square"
-             top="4"
-             width="18" />
-            <icon
-             height="16"
-	     top="10"
-	     left="10"
-             layout="topleft"
-             mouse_opaque="true"
-             width="16" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title"
-             top="10"
-             width="355">
-                [DESC]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_no_modify"
-             top="10"
-             width="355">
-                [DESC]: cannot modify
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_loading"
-             top="10"
-             width="355">
-                [DESC]: loading...
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_not_worn"
-             top="10"
-             width="355">
-                [DESC]: not worn
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="16"
-             layout="topleft"
-             left="10"
-             name="path"
-             top="36"
-             width="373">
-                Located in [PATH]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="not worn instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                Put on a new set of eyes by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="no modify instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                You do not have permission to modify this wearable.
-            </text>
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Iris"
-             layout="topleft"
-             left="10"
-             name="Iris"
-             tool_tip="Click to choose a picture"
-             top="66"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Eyes"
-             label_selected="Create New Eyes"
-             layout="topleft"
-             name="Create New"
-             top="66"
-             width="160" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             name="Item Action Label"
-             left="10"
-             width="130">
-                Eyes:
-            </text>
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save"
-             label_selected="Save"
-             layout="topleft"
-             left_pad="2"
-             name="Save"
-             top="477"
-             width="82" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save As..."
-             label_selected="Save As..."
-             layout="topleft"
-             left_pad="3"
-             name="Save As"
-             top="477"
-             width="115" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Revert"
-             label_selected="Revert"
-             layout="topleft"
-             left_pad="3"
-             name="Revert"
-             top="477"
-             width="120" />
-        </panel>
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="16"
-             layout="topleft"
-             left="5"
-             name="clothes_placeholder"
-	     font="SansSerifSmallBold"
-             top="125"
-             width="100">
-                Clothes
-            </text>
-	    <placeholder />
-        <panel
-         border="false"
- background_visible="true"
- bg_alpha_color="DkGray2"
-         follows="left|top|right|bottom"
-         height="508"
-         label="Shirt"
-         layout="topleft"
-         name="Shirt"
-         help_topic="customize_shirt_tab"
-         top_delta="0"
-         width="400">
-            <icon
-             follows="top|left"
-             height="18"
-             image_name="Lock"
-             layout="topleft"
-             left="10"
-             mouse_opaque="true"
-             name="square"
-             top="10"
-             width="18" />
-            <icon
-             height="16"
-	     top="10"
-	     left="10"
-             layout="topleft"
-             mouse_opaque="true"
-             width="16" />
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Fabric"
-             layout="topleft"
-             left="10"
-             name="Fabric"
-             tool_tip="Click to choose a picture"
-             top="66"
-             width="82" />
-            <color_swatch
-             can_apply_immediately="true"
-             follows="left|top"
-             height="108"
-             label="Color/Tint"
-             layout="topleft"
-             name="Color/Tint"
-             tool_tip="Click to open color picker"
-             top_delta="102"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Take Off"
-             label_selected="Take Off"
-             layout="topleft"
-             name="Take Off"
-             top_pad="4"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Shirt"
-             label_selected="Create New Shirt"
-             layout="topleft"
-             name="Create New"
-             top="66"
-             width="160" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             name="Item Action Label"
-             left="10"
-             width="130">
-                Shirt:
-            </text>
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save"
-             label_selected="Save"
-             layout="topleft"
-             left_pad="2"
-             name="Save"
-             top="477"
-             width="82" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save As..."
-             label_selected="Save As..."
-             layout="topleft"
-             left_pad="3"
-             name="Save As"
-             top="477"
-             width="115" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Revert"
-             label_selected="Revert"
-             layout="topleft"
-             left_pad="3"
-             name="Revert"
-             top="477"
-             width="120" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title"
-             top="10"
-             width="355">
-                [DESC]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_no_modify"
-             top="10"
-             width="355">
-                [DESC]: cannot modify
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_loading"
-             top="10"
-             width="355">
-                [DESC]: loading...
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_not_worn"
-             top="10"
-             width="355">
-                [DESC]: not worn
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="16"
-             layout="topleft"
-             left="10"
-             name="path"
-             top="36"
-             width="373">
-                Located in [PATH]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="not worn instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                Put on a new shirt by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="no modify instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                You do not have permission to modify this wearable.
-            </text>
-        </panel>
-        <panel
-         border="false"
- background_visible="true"
- bg_alpha_color="DkGray2"
-         follows="left|top|right|bottom"
-         height="508"
-         label="Pants"
-         layout="topleft"
-         name="Pants"
-         help_topic="customize_pants_tab"
-         width="400">
-            <icon
-             follows="top|left"
-             height="18"
-             image_name="Lock"
-             layout="topleft"
-             left="10"
-             mouse_opaque="true"
-             name="square"
-             top="10"
-             width="18" />
-            <icon
-             height="16"
-             layout="topleft"
-	     left="10"
-             mouse_opaque="true"
-	     top="10"
-             width="16" />
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Fabric"
-             layout="topleft"
-             left="10"
-             name="Fabric"
-             tool_tip="Click to choose a picture"
-             top="66"
-             width="82" />
-            <color_swatch
-             can_apply_immediately="true"
-             follows="left|top"
-             height="108"
-             label="Color/Tint"
-             layout="topleft"
-             name="Color/Tint"
-             tool_tip="Click to open color picker"
-             top_delta="102"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Take Off"
-             label_selected="Take Off"
-             layout="topleft"
-             name="Take Off"
-             top_pad="4"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Pants"
-             label_selected="Create New Pants"
-             layout="topleft"
-             name="Create New"
-             top="66"
-             width="160" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             name="Item Action Label"
-             left="10"
-             width="130">
-                Pants:
-            </text>
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save"
-             label_selected="Save"
-             layout="topleft"
-             left_pad="2"
-             name="Save"
-             top="477"
-             width="82" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save As..."
-             label_selected="Save As..."
-             layout="topleft"
-             left_pad="3"
-             name="Save As"
-             top="477"
-             width="115" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Revert"
-             label_selected="Revert"
-             layout="topleft"
-             left_pad="3"
-             name="Revert"
-             top="477"
-             width="120" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title"
-             top="10"
-             width="355">
-                [DESC]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_no_modify"
-             top="10"
-             width="355">
-                [DESC]: cannot modify
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_loading"
-             top="10"
-             width="355">
-                [DESC]: loading...
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_not_worn"
-             top="10"
-             width="355">
-                [DESC]: not worn
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="14"
-             layout="topleft"
-             left="10"
-             name="path"
-             top="36"
-             width="373">
-                Located in [PATH]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="not worn instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                Put on new pants by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="no modify instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                You do not have permission to modify this wearable.
-            </text>
-        </panel>
-        <panel
-         border="false"
- background_visible="true"
- bg_alpha_color="DkGray2"
-         follows="left|top|right|bottom"
-         height="508"
-         label="Shoes"
-         layout="topleft"
-         name="Shoes"
-         help_topic="customize_shoes_tab"
-         width="400">
-            <icon
-             follows="top|left"
-             height="18"
-             image_name="Lock"
-             layout="topleft"
-             left="10"
-             mouse_opaque="true"
-             name="square"
-             top="10"
-             width="18" />
-            <icon
-             height="16"
-             layout="topleft"
-	     left="10"
-             mouse_opaque="true"
-	     top="10"
-             width="16" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title"
-             top="10"
-             width="355">
-                [DESC]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_no_modify"
-             top="10"
-             width="355">
-                [DESC]: cannot modify
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_loading"
-             top="10"
-             width="355">
-                [DESC]: loading...
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_not_worn"
-             top="10"
-             width="355">
-                [DESC]: not worn
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="14"
-             layout="topleft"
-             left="10"
-             name="path"
-             top="36"
-             width="373">
-                Located in [PATH]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="not worn instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                Put on a new pair of shoes by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
-            </text>
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Shoes"
-             label_selected="Create New Shoes"
-             layout="topleft"
-             name="Create New"
-             top_pad="18"
-             width="160" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="no modify instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                You do not have permission to modify this wearable.
-            </text>
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Fabric"
-             layout="topleft"
-             left="10"
-             name="Fabric"
-             tool_tip="Click to choose a picture"
-             top="66"
-             width="82" />
-            <color_swatch
-             can_apply_immediately="true"
-             follows="left|top"
-             height="108"
-             label="Color/Tint"
-             layout="topleft"
-             name="Color/Tint"
-             tool_tip="Click to open color picker"
-             top_delta="102"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Take Off"
-             label_selected="Take Off"
-             layout="topleft"
-             name="Take Off"
-             top_pad="4"
-             width="82" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             left="10"
-             name="Item Action Label"
-             width="130">
-                Shoes:
-            </text>
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save"
-             label_selected="Save"
-             layout="topleft"
-             left_pad="2"
-             name="Save"
-             top="477"
-             width="82" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save As..."
-             label_selected="Save As..."
-             layout="topleft"
-             left_pad="3"
-             name="Save As"
-             top="477"
-             width="115" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Revert"
-             label_selected="Revert"
-             layout="topleft"
-             left_pad="3"
-             name="Revert"
-             top="477"
-             width="120" />
-        </panel>
-        <panel
-         border="false"
- background_visible="true"
- bg_alpha_color="DkGray2"
-         follows="left|top|right|bottom"
-         height="508"
-         label="Socks"
-         layout="topleft"
-         name="Socks"
-         help_topic="customize_socks_tab"
-         width="400">
-            <icon
-             follows="top|left"
-             height="18"
-             image_name="Lock"
-             layout="topleft"
-             left="10"
-             mouse_opaque="true"
-             name="square"
-             top="10"
-             width="18" />
-            <icon
-             height="16"
-             layout="topleft"
-	     left="10"
-             mouse_opaque="true"
-	     top="10"
-             width="16" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title"
-             top="10"
-             width="355">
-                [DESC]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_no_modify"
-             top="10"
-             width="355">
-                [DESC]: cannot modify
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_loading"
-             top="10"
-             width="355">
-                [DESC]: loading...
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_not_worn"
-             top="10"
-             width="355">
-                [DESC]: not worn
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="14"
-             layout="topleft"
-             left="10"
-             name="path"
-             top="36"
-             width="373">
-                Located in [PATH]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="not worn instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                Put on new socks by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
-            </text>
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Socks"
-             label_selected="Create New Socks"
-             layout="topleft"
-             name="Create New"
-             top_pad="7"
-             width="160" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="no modify instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                You do not have permission to modify this wearable.
-            </text>
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Fabric"
-             layout="topleft"
-             left="10"
-             name="Fabric"
-             tool_tip="Click to choose a picture"
-             top="66"
-             width="82" />
-            <color_swatch
-             can_apply_immediately="true"
-             follows="left|top"
-             height="108"
-             label="Color/Tint"
-             layout="topleft"
-             name="Color/Tint"
-             tool_tip="Click to open color picker"
-             top_delta="102"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Take Off"
-             label_selected="Take Off"
-             layout="topleft"
-             name="Take Off"
-             top_pad="4"
-             width="82" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             left="10"
-             name="Item Action Label"
-             width="130">
-                Socks:
-            </text>
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save"
-             label_selected="Save"
-             layout="topleft"
-             left_pad="2"
-             name="Save"
-             top="477"
-             width="82" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save As..."
-             label_selected="Save As..."
-             layout="topleft"
-             left_pad="3"
-             name="Save As"
-             top="477"
-             width="115" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Revert"
-             label_selected="Revert"
-             layout="topleft"
-             left_pad="3"
-             name="Revert"
-             top="477"
-             width="120" />
-        </panel>
-        <panel
-         border="false"
- background_visible="true"
- bg_alpha_color="DkGray2"
-         follows="left|top|right|bottom"
-         height="508"
-         label="Jacket"
-         layout="topleft"
-         name="Jacket"
-         help_topic="customize_jacket_tab"
-         width="400">
-            <icon
-             follows="top|left"
-             height="18"
-             image_name="Lock"
-             layout="topleft"
-             left="10"
-             mouse_opaque="true"
-             name="square"
-             top="10"
-             width="18" />
-            <icon
-             height="16"
-             layout="topleft"
-	     left="10"
-             mouse_opaque="true"
-	     top="10"
-             width="16" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title"
-             top="10"
-             width="355">
-                [DESC]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_no_modify"
-             top="10"
-             width="355">
-                [DESC]: cannot modify
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_loading"
-             top="10"
-             width="355">
-                [DESC]: loading...
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_not_worn"
-             top="10"
-             width="355">
-                [DESC]: not worn
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="14"
-             layout="topleft"
-             left="10"
-             name="path"
-             top="36"
-             width="373">
-                Located in [PATH]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="not worn instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                Put on a new jacket by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
-            </text>
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Jacket"
-             label_selected="Create New Jacket"
-             layout="topleft"
-             name="Create New"
-             top_pad="7"
-             width="160" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="no modify instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                You do not have permission to modify this wearable.
-            </text>
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Upper Fabric"
-             layout="topleft"
-             left="10"
-             name="Upper Fabric"
-             tool_tip="Click to choose a picture"
-             top="66"
-             width="82" />
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Lower Fabric"
-             layout="topleft"
-             name="Lower Fabric"
-             tool_tip="Click to choose a picture"
-             top_delta="102"
-             width="82" />
-            <color_swatch
-             can_apply_immediately="true"
-             follows="left|top"
-             height="108"
-             label="Color/Tint"
-             layout="topleft"
-             name="Color/Tint"
-             tool_tip="Click to open color picker"
-             top_delta="102"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Take Off"
-             label_selected="Take Off"
-             layout="topleft"
-             name="Take Off"
-             top_pad="4"
-             width="82" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             left="10"
-             name="Item Action Label"
-             width="130">
-                Jacket:
-            </text>
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save"
-             label_selected="Save"
-             layout="topleft"
-             left_pad="2"
-             name="Save"
-             top="477"
-             width="82" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save As..."
-             label_selected="Save As..."
-             layout="topleft"
-             left_pad="3"
-             name="Save As"
-             top="477"
-             width="115" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Revert"
-             label_selected="Revert"
-             layout="topleft"
-             left_pad="3"
-             name="Revert"
-             top="477"
-             width="120" />
-        </panel>
-        <panel
-         border="false"
- background_visible="true"
- bg_alpha_color="DkGray2"
-         follows="left|top|right|bottom"
-         height="508"
-         label="Gloves"
-         layout="topleft"
-         name="Gloves"
-         help_topic="customize_gloves_tab"
-         width="400">
-            <icon
-             follows="top|left"
-             height="18"
-             image_name="Lock"
-             layout="topleft"
-             left="10"
-             mouse_opaque="true"
-             name="square"
-             top="10"
-             width="18" />
-            <icon
-             height="16"
-             layout="topleft"
-	     left="10"
-             mouse_opaque="true"
-	     top="10"
-             width="16" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title"
-             top="10"
-             width="355">
-                [DESC]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_no_modify"
-             top="10"
-             width="355">
-                [DESC]: cannot modify
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_loading"
-             top="10"
-             width="355">
-                [DESC]: loading...
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_not_worn"
-             top="10"
-             width="355">
-                [DESC]: not worn
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="14"
-             layout="topleft"
-             left="10"
-             name="path"
-             top="36"
-             width="373">
-                Located in [PATH]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="not worn instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                Put on new gloves by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
-            </text>
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Gloves"
-             label_selected="Create New Gloves"
-             layout="topleft"
-             name="Create New"
-             top_pad="7"
-             width="160" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="no modify instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                You do not have permission to modify this wearable.
-            </text>
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Fabric"
-             layout="topleft"
-             left="10"
-             name="Fabric"
-             tool_tip="Click to choose a picture"
-             top="66"
-             width="82" />
-            <color_swatch
-             can_apply_immediately="true"
-             follows="left|top"
-             height="108"
-             label="Color/Tint"
-             layout="topleft"
-             name="Color/Tint"
-             tool_tip="Click to open color picker"
-             top_delta="102"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Take Off"
-             label_selected="Take Off"
-             layout="topleft"
-             name="Take Off"
-             top_pad="4"
-             width="82" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             left="10"
-             name="Item Action Label"
-             width="130">
-                Gloves:
-            </text>
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save"
-             label_selected="Save"
-             layout="topleft"
-             left_pad="2"
-             name="Save"
-             top="477"
-             width="82" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save As..."
-             label_selected="Save As..."
-             layout="topleft"
-             left_pad="3"
-             name="Save As"
-             top="477"
-             width="115" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Revert"
-             label_selected="Revert"
-             layout="topleft"
-             left_pad="3"
-             name="Revert"
-             top="477"
-             width="120" />
-        </panel>
-        <panel
-         border="false"
- background_visible="true"
- bg_alpha_color="DkGray2"
-         follows="left|top|right|bottom"
-         height="508"
-         label="Undershirt"
-         layout="topleft"
-         name="Undershirt"
-         help_topic="customize_undershirt_tab"
-         width="400">
-            <icon
-             follows="top|left"
-             height="18"
-             image_name="Lock"
-             layout="topleft"
-             left="10"
-             mouse_opaque="true"
-             name="square"
-             top="10"
-             width="18" />
-            <icon
-             height="16"
-             layout="topleft"
-	     left="10"
-             mouse_opaque="true"
-	     top="10"
-             width="16" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title"
-             top="10"
-             width="355">
-                [DESC]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_no_modify"
-             top="10"
-             width="355">
-                [DESC]: cannot modify
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_loading"
-             top="10"
-             width="355">
-                [DESC]: loading...
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_not_worn"
-             top="10"
-             width="355">
-                [DESC]: not worn
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="14"
-             layout="topleft"
-             left="10"
-             name="path"
-             top="36"
-             width="373">
-                Located in [PATH]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="not worn instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                Put on a new undershirt by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
-            </text>
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Undershirt"
-             label_selected="Create New Undershirt"
-             layout="topleft"
-             name="Create New"
-             top_pad="7"
-             width="160" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="no modify instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                You do not have permission to modify this wearable.
-            </text>
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Fabric"
-             layout="topleft"
-             left="10"
-             name="Fabric"
-             tool_tip="Click to choose a picture"
-             top="66"
-             width="82" />
-            <color_swatch
-             can_apply_immediately="true"
-             follows="left|top"
-             height="108"
-             label="Color/Tint"
-             layout="topleft"
-             name="Color/Tint"
-             tool_tip="Click to open color picker"
-             top_delta="102"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Take Off"
-             label_selected="Take Off"
-             layout="topleft"
-             name="Take Off"
-             top_pad="4"
-             width="82" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             left="10"
-             name="Item Action Label"
-             width="130">
-                Undershirt:
-            </text>
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save"
-             label_selected="Save"
-             layout="topleft"
-             left_pad="2"
-             name="Save"
-             top="477"
-             width="82" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save As..."
-             label_selected="Save As..."
-             layout="topleft"
-             left_pad="3"
-             name="Save As"
-             top="477"
-             width="115" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Revert"
-             label_selected="Revert"
-             layout="topleft"
-             left_pad="3"
-             name="Revert"
-             top="477"
-             width="120" />
-        </panel>
-        <panel
-         border="false"
- background_visible="true"
- bg_alpha_color="DkGray2"
-         follows="left|top|right|bottom"
-         height="508"
-         label="Underpants"
-         layout="topleft"
-         name="Underpants"
-         help_topic="customize_underpants_tab"
-         width="400">
-            <icon
-             follows="top|left"
-             height="18"
-             image_name="Lock"
-             layout="topleft"
-             left="10"
-             mouse_opaque="true"
-             name="square"
-             top="10"
-             width="18" />
-            <icon
-             height="16"
-             layout="topleft"
-	     left="10"
-             mouse_opaque="true"
-	     top="10"
-             width="16" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title"
-             top="10"
-             width="355">
-                [DESC]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_no_modify"
-             top="10"
-             width="355">
-                [DESC]: cannot modify
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_loading"
-             top="10"
-             width="355">
-                [DESC]: loading...
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_not_worn"
-             top="10"
-             width="355">
-                [DESC]: not worn
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="14"
-             layout="topleft"
-             left="10"
-             name="path"
-             top="36"
-             width="373">
-                Located in [PATH]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="not worn instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                Put on new underpants by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
-            </text>
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Underpants"
-             label_selected="Create New Underpants"
-             layout="topleft"
-             name="Create New"
-             top_pad="7"
-             width="160" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="no modify instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                You do not have permission to modify this wearable.
-            </text>
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Fabric"
-             layout="topleft"
-             left="10"
-             name="Fabric"
-             tool_tip="Click to choose a picture"
-             top="66"
-             width="82" />
-            <color_swatch
-             can_apply_immediately="true"
-             follows="left|top"
-             height="108"
-             label="Color/Tint"
-             layout="topleft"
-             name="Color/Tint"
-             tool_tip="Click to open color picker"
-             top_delta="102"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Take Off"
-             label_selected="Take Off"
-             layout="topleft"
-             name="Take Off"
-             top_pad="4"
-             width="82" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             left="10"
-             name="Item Action Label"
-             width="130">
-                Underpants:
-            </text>
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save"
-             label_selected="Save"
-             layout="topleft"
-             left_pad="2"
-             name="Save"
-             top="477"
-             width="82" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save As..."
-             label_selected="Save As..."
-             layout="topleft"
-             left_pad="3"
-             name="Save As"
-             top="477"
-             width="115" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Revert"
-             label_selected="Revert"
-             layout="topleft"
-             left_pad="3"
-             name="Revert"
-             top="477"
-             width="120" />
-        </panel>
-        <panel
-         border="false"
- background_visible="true"
- bg_alpha_color="DkGray2"
-         follows="left|top|right|bottom"
-         height="508"
-         label="Skirt"
-         layout="topleft"
-         name="Skirt"
-         help_topic="customize_skirt_tab"
-         width="400">
-            <icon
-             follows="top|left"
-             height="18"
-             image_name="Lock"
-             layout="topleft"
-             left="10"
-             mouse_opaque="true"
-             name="square"
-             top="10"
-             width="18" />
-            <icon
-             height="16"
-             layout="topleft"
-	     left="10"
-             mouse_opaque="true"
-	     top="10"
-             width="16" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title"
-             top="10"
-             width="355">
-                [DESC]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_no_modify"
-             top="10"
-             width="355">
-                [DESC]: cannot modify
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_loading"
-             top="10"
-             width="355">
-                [DESC]: loading...
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_not_worn"
-             top="10"
-             width="355">
-                [DESC]: not worn
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="14"
-             layout="topleft"
-             left="10"
-             name="path"
-             top="36"
-             width="373">
-                Located in [PATH]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="not worn instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                Put on a new skirt by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
-            </text>
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Skirt"
-             label_selected="Create New Skirt"
-             layout="topleft"
-             name="Create New"
-             top_pad="7"
-             width="160" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="no modify instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                You do not have permission to modify this wearable.
-            </text>
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Fabric"
-             layout="topleft"
-             left="10"
-             name="Fabric"
-             tool_tip="Click to choose a picture"
-             top="66"
-             width="82" />
-            <color_swatch
-             can_apply_immediately="true"
-             follows="left|top"
-             height="108"
-             label="Color/Tint"
-             layout="topleft"
-             name="Color/Tint"
-             tool_tip="Click to open color picker"
-             top_delta="102"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Take Off"
-             label_selected="Take Off"
-             layout="topleft"
-             name="Take Off"
-             top_pad="4"
-             width="82" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             left="10"
-             name="Item Action Label"
-             width="130">
-                Skirt:
-            </text>
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save"
-             label_selected="Save"
-             layout="topleft"
-             left_pad="2"
-             name="Save"
-             top="477"
-             width="82" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save As..."
-             label_selected="Save As..."
-             layout="topleft"
-             left_pad="3"
-             name="Save As"
-             top="477"
-             width="115" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Revert"
-             label_selected="Revert"
-             layout="topleft"
-             left_pad="3"
-             name="Revert"
-             top="477"
-             width="120" />
-        </panel>
-        <panel
-         border="false"
- background_visible="true"
- bg_alpha_color="DkGray2"
-         follows="left|top|right|bottom"
-         height="508"
-         label="Tattoo"
-         layout="topleft"
-         name="Tattoo"
-         help_topic="customize_tattoo_tab"
-         width="400">
-            <icon
-             follows="top|left"
-             height="18"
-             image_name="Lock"
-             layout="topleft"
-             left="10"
-             mouse_opaque="true"
-             name="square"
-             top="10"
-             width="18" />
-            <icon
-             height="16"
-             layout="topleft"
-	     left="10"
-             mouse_opaque="true"
-	     top="10"
-             width="16" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title"
-             top="10"
-             width="355">
-                [DESC]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_no_modify"
-             top="10"
-             width="355">
-                [DESC]: cannot modify
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_loading"
-             top="10"
-             width="355">
-                [DESC]: loading...
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_not_worn"
-             top="10"
-             width="355">
-                [DESC]: not worn
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="14"
-             layout="topleft"
-             left="10"
-             name="path"
-             top="36"
-             width="373">
-                Located in [PATH]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="not worn instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                Put on a new tattoo by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
-            </text>
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Tattoo"
-             label_selected="Create New Tattoo"
-             layout="topleft"
-             name="Create New"
-             top_pad="7"
-             width="160" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="no modify instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                You do not have permission to modify this wearable.
-            </text>
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Head Tattoo"
-             layout="topleft"
-             left="10"
-             name="Head Tattoo"
-             tool_tip="Click to choose a picture"
-             top="66"
-             width="82" />
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Upper Tattoo"
-             layout="topleft"
-             name="Upper Tattoo"
-             tool_tip="Click to choose a picture"
-             left_delta="90"
-             width="82" />
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Lower Tattoo"
-             layout="topleft"
-             name="Lower Tattoo"
-             tool_tip="Click to choose a picture"
-             left_delta="90"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Take Off"
-             label_selected="Take Off"
-             layout="topleft"
-             name="Take Off"
-             top_pad="4"
-             left="10"
-             width="82" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             left="10"
-             name="Item Action Label"
-             width="130">
-                Tattoo:
-            </text>
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save"
-             label_selected="Save"
-             layout="topleft"
-             left_pad="2"
-             name="Save"
-             top="477"
-             width="82" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save As..."
-             label_selected="Save As..."
-             layout="topleft"
-             left_pad="3"
-             name="Save As"
-             top="477"
-             width="115" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Revert"
-             label_selected="Revert"
-             layout="topleft"
-             left_pad="3"
-             name="Revert"
-             top="477"
-             width="120" />
-        </panel>
-        <panel
-         border="false"
- background_visible="true"
- bg_alpha_color="DkGray2"
-         follows="left|top|right|bottom"
-         height="508"
-         label="Alpha"
-         layout="topleft"
-         name="Alpha"
-         help_topic="customize_alpha_tab"
-         width="400">
-            <icon
-             follows="top|left"
-             height="18"
-             image_name="Lock"
-             layout="topleft"
-             left="10"
-             mouse_opaque="true"
-             name="square"
-             top="10"
-             width="18" />
-            <icon
-             height="16"
-             layout="topleft"
-	     left="10"
-             mouse_opaque="true"
-	     top="10"
-             width="16" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title"
-             top="10"
-             width="355">
-                [DESC]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_no_modify"
-             top="10"
-             width="355">
-                [DESC]: cannot modify
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_loading"
-             top="10"
-             width="355">
-                [DESC]: loading...
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_not_worn"
-             top="10"
-             width="355">
-                [DESC]: not worn
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="14"
-             layout="topleft"
-             left="10"
-             name="path"
-             top="36"
-             width="373">
-                Located in [PATH]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="not worn instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                Put on a new alpha mask by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
-            </text>
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Alpha"
-             label_selected="Create New Alpha"
-             layout="topleft"
-             name="Create New"
-             top_pad="18"
-             width="160" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="no modify instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                You do not have permission to modify this wearable.
-            </text>
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Lower Alpha"
-             layout="topleft"
-             left="10"
-             name="Lower Alpha"
-             tool_tip="Click to choose a picture"
-             top="66"
-             width="82" />
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Upper Alpha"
-             layout="topleft"
-             name="Upper Alpha"
-             tool_tip="Click to choose a picture"
-             left_delta="90"
-             width="82" />
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Head Alpha"
-             layout="topleft"
-             name="Head Alpha"
-             tool_tip="Click to choose a picture"
-             left_delta="90"
-             width="82" />
-            <check_box
-             control_name="LowerAlphaTextureInvisible"
-             follows="left"
-             height="16"
-             layout="topleft"
-             left="43"
-             name="lower alpha texture invisible"
-             top_delta="96"
-             width="16" />
-            <check_box
-             control_name="UpperAlphaTextureInvisible"
-             follows="left"
-             height="16"
-             layout="topleft"
-             left_pad="72"
-             name="upper alpha texture invisible"
-             width="16" />
-            <check_box
-             control_name="HeadAlphaTextureInvisible"
-             follows="left"
-             height="16"
-             layout="topleft"
-             left_pad="72"
-             name="head alpha texture invisible"
-             width="16" />
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Eye Alpha"
-             layout="topleft"
-             name="Eye Alpha"
-             tool_tip="Click to choose a picture"
-             left="10"
-             top_pad="20"
-             width="82" />
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Hair Alpha"
-             layout="topleft"
-             name="Hair Alpha"
-             left_delta="90"
-             tool_tip="Click to choose a picture"
-             width="82" />
-            <check_box
-             control_name="Eye AlphaTextureInvisible"
-             follows="left"
-             height="16"
-             layout="topleft"
-             left="43"
-             name="eye alpha texture invisible"
-             top_delta="96"
-             width="16" />
-            <check_box
-             control_name="HairAlphaTextureInvisible"
-             follows="left"
-             height="16"
-             layout="topleft"
-             left_pad="72"
-             name="hair alpha texture invisible"
-             width="16" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Take Off"
-             label_selected="Take Off"
-             layout="topleft"
-             name="Take Off"
-             left="10"
-             top_pad="20"
-             width="82" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             left="10"
-             name="Item Action Label"
-             width="130">
-                Alpha:
-            </text>
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save"
-             label_selected="Save"
-             layout="topleft"
-             left_pad="2"
-             name="Save"
-             top="477"
-             width="82" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save As..."
-             label_selected="Save As..."
-             layout="topleft"
-             left_pad="3"
-             name="Save As"
-             top="477"
-             width="115" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Revert"
-             label_selected="Revert"
-             layout="topleft"
-             left_pad="3"
-             name="Revert"
-             top="477"
-             width="120" />
-        </panel>
-    </tab_container>
-    <scroll_container
-     follows="left|top|right|bottom"
-     height="409"
-     layout="topleft"
-     left="247"
-     mouse_opaque="false"
-     name="panel_container"
-     top="92"
-     width="330">
-        <scrolling_panel_list
-         follows="left|bottom"
-         layout="topleft"
-         name="panel_list" />
-    </scroll_container>
-    <button
-     bottom="460"
-     follows="right|left"
-     height="23"
-     label="Script Info"
-     label_selected="Script Info"
-     layout="topleft"
-     name="script_info"
-     tool_tip="Show scripts attached to your avatar"
-     left="13"
-     width="90" ></button>
-    <button
-     bottom="574"
-     follows="right|bottom"
-     height="23"
-     label="Make Outfit"
-     label_selected="Make Outfit"
-     layout="topleft"
-     name="make_outfit_btn"
-     right="-218"
-     width="120" />
-    <button
-     bottom="574"
-     follows="right|bottom"
-     height="23"
-     label="Cancel"
-     label_selected="Cancel"
-     layout="topleft"
-     name="Cancel"
-     right="-10"
-     width="100" />
-    <button
-     bottom="574"
-     follows="right|bottom"
-     height="23"
-     label="OK"
-     label_selected="OK"
-     layout="topleft"
-     name="Ok"
-     right="-114"
-     width="100" />
-</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
index acdecbad31..e2348375d5 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
@@ -80,14 +80,6 @@ name="Edit Outfit">
     <menu_item_call.on_enable
      function="Edit.EnableEditShape" />
   </menu_item_call>
-  <menu_item_call label="Edit My Physics"
-  layout="topleft"
-  name="Edit My Physics">
-    <menu_item_call.on_click
-     function="EditPhysics" />
-    <menu_item_call.on_enable
-     function="Edit.EnableEditPhysics" />
-  </menu_item_call>
   <menu_item_call
     label="My Friends"
     layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_self.xml b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
index 71b8eea94c..83bc4d0720 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
@@ -140,6 +140,18 @@
                      function="Edit.EnableTakeOff"
                      parameter="tattoo" />
                 </menu_item_call>
+               <menu_item_call
+                 enabled="false"
+                 label="Physics"
+                 layout="topleft"
+                 name="Self Physics">
+                    <menu_item_call.on_click
+                     function="Edit.TakeOff"
+                     parameter="physics" />
+                    <menu_item_call.on_enable
+                     function="Edit.EnableTakeOff"
+                     parameter="physics" />
+                </menu_item_call>
                <menu_item_call
                  enabled="false"
                  label="Alpha"
@@ -206,14 +218,6 @@
         function="EditShape" />
        <menu_item_call.on_enable
         function="Edit.EnableEditShape" />
-   </menu_item_call>
-    <menu_item_call label="Edit My Physics" 
-    layout="topleft"
-    name="Edit My Physics">
-       <menu_item_call.on_click
-        function="EditPhysics" />
-       <menu_item_call.on_enable
-        function="Edit.EnableEditPhysics" />
    </menu_item_call>
    <menu_item_call
      label="My Friends"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index c0046d8e28..e91f4458ae 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -200,6 +200,14 @@
              function="Inventory.DoCreate"
              parameter="tattoo" />
         </menu_item_call>
+        <menu_item_call
+         label="New Physics"
+         layout="topleft"
+         name="New Physics">
+            <menu_item_call.on_click
+             function="Inventory.DoCreate"
+             parameter="physics" />
+        </menu_item_call>
     </menu>
     <menu
      label="New Body Parts"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
index ae98abf4fb..90e8db3709 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -188,6 +188,14 @@
                      function="Inventory.DoCreate"
                      parameter="tattoo" />
                 </menu_item_call>
+                <menu_item_call
+                 label="New Physics"
+                 layout="topleft"
+                 name="New Physics">
+                    <menu_item_call.on_click
+                     function="Inventory.DoCreate"
+                     parameter="physics" />
+                </menu_item_call>
             </menu>
             <menu
              height="85"
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
index 732b8a788d..cba1804a5e 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -132,6 +132,14 @@
                      function="Gear.Create"
                      parameter="alpha" />
                 </menu_item_call>
+                <menu_item_call
+                 label="New Physics"
+                 layout="topleft"
+                 name="New Physics">
+                    <menu_item_call.on_click
+                     function="Gear.Create"
+                     parameter="physics" />
+                </menu_item_call>
                 <menu_item_call
                  label="New Tattoo"
                  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 0b85074eb6..72f68c41e3 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3305,6 +3305,16 @@
                  function="Edit.EnableTakeOff"
                  parameter="tattoo" />
             </menu_item_call>
+            <menu_item_call
+             label="Physics"
+             name="Physics">
+                <menu_item_call.on_click
+                 function="Edit.TakeOff"
+                 parameter="physics" />
+                <menu_item_call.on_enable
+                 function="Edit.EnableTakeOff"
+                 parameter="physics" />
+            </menu_item_call>
             <menu_item_call
              label="All Clothes"
              name="All Clothes">
diff --git a/indra/newview/skins/default/xui/en/panel_edit_physics.xml b/indra/newview/skins/default/xui/en/panel_edit_physics.xml
new file mode 100644
index 0000000000..4e781e2360
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_edit_physics.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+ <panel
+     background_visible="true"
+	 follows="all"
+	 height="400"
+	 layout="topleft"
+	 left="0"
+	 name="edit_physics_panel"
+	 top_pad="10"
+	 width="333" >
+	 <panel
+         border="false"
+         bg_alpha_color="DkGray2"
+         bg_opaque_color="DkGray2"
+         background_visible="true"
+         background_opaque="true"
+         follows="all"
+         height="300"
+         layout="topleft"
+         left="10"
+         name="accordion_panel"
+         top_pad="10"
+         width="313">
+     <accordion
+        fit_parent="true"
+        follows="all"
+        height ="300"
+        layout="topleft"
+        left="0"
+        name="wearable_accordion"
+        single_expansion="true"
+        top="0"
+        width="313">
+		<accordion_tab
+			layout="topleft"
+            fit_panel="false"
+			min_height="150"
+			name="physics_main_tab"
+			title="Physics">
+			<scrolling_panel_list
+				follows="all"
+                layout="topleft"
+				left="0"
+				name="physics_main_param_list"
+				top="0"
+				width="303" />
+		</accordion_tab>
+	</accordion>
+    </panel>
+</panel>
+
diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
index 9fb777e0e7..aa540cdfe0 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
@@ -71,6 +71,10 @@
      name="edit_tattoo_title">
         Editing Tattoo
     </string>
+    <string
+     name="edit_physics_title">
+        Editing Physics
+    </string>
     <string
      name="shape_desc_text">
         Shape:
@@ -131,6 +135,10 @@
      name="tattoo_desc_text">
         Tattoo:
     </string>
+    <string
+     name="physics_desc_text">
+        Physics:
+    </string>
     <!-- Default width of the button should be to show it without label.
      Button will be extedned in code to show whole label when wearable is being changed.
     -->
@@ -407,6 +415,16 @@
          top="8"
          visible="false"
          width="333" />
+        <panel
+         filename="panel_edit_physics.xml"
+         follows="all"
+         height="425"
+         layout="topleft"
+         left="0"
+         name="edit_physics_panel"
+         top="8"
+         visible="false"
+         width="333" />
     </panel>
     <panel
      follows="bottom|left|right"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 7a010697ac..532a4a2e6d 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1813,6 +1813,7 @@ Clears (deletes) the media and all params from the given face.
 	<string name="skirt">Skirt</string>
 	<string name="alpha">Alpha</string>
 	<string name="tattoo">Tattoo</string>
+  <string name="physics">Physics</string>
   <string name="invalid">invalid</string>
   <string name="none">none</string>
   
@@ -1828,6 +1829,7 @@ Clears (deletes) the media and all params from the given face.
 	<string name="skirt_not_worn">Skirt not worn</string>
 	<string name="alpha_not_worn">Alpha not worn</string>
 	<string name="tattoo_not_worn">Tattoo not worn</string>
+  <string name="physics_not_worn">Physics not worn</string>
 	<string name="invalid_not_worn">invalid</string>
 
 	<!-- Create new wearable of the specified type -->
@@ -1846,6 +1848,7 @@ Clears (deletes) the media and all params from the given face.
 	<string name="create_new_skirt">Create new skirt</string>
 	<string name="create_new_alpha">Create new alpha</string>
 	<string name="create_new_tattoo">Create new tattoo</string>
+  <string name="create_new_physics">Create new physics</string>
 	<string name="create_new_invalid">invalid</string>
 
   <!-- Wearable List-->
@@ -3186,6 +3189,7 @@ Abuse Report</string>
   <string name="New Skirt">New Skirt</string>
   <string name="New Alpha">New Alpha</string>
   <string name="New Tattoo">New Tattoo</string>
+  <string name="New Physics">New Physics</string>
   <string name="Invalid Wearable">Invalid Wearable</string>
   <string name="New Gesture">New Gesture</string>
   <string name="New Script">New Script</string>
-- 
GitLab