Moved Drag to be a general shape physics param, to save on number of transmitted params.

4 files changed, 1767 insertions, 1792 deletions

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index 765d016888..fa286e99ef 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -11830,6 +11830,20 @@ render_pass="bump">
      id="10003"
      group="0"
      sex="female"
+     name="Breast_Physics_Drag"
+     label="Breast Physics Drag"
+     wearable="physics"
+     edit_group="physics_advanced"
+     value_default=".15"
+     value_min="0"
+     value_max=".5">
+	 <param_driver />
+    </param>
+
+   <param
+     id="10004"
+     group="0"
+     sex="female"
      name="Breast_Physics_UpDown_Max_Velocity"
      label="Breast Physics UpDown Max Speed"
      wearable="physics"
@@ -11840,7 +11854,7 @@ render_pass="bump">
 	 <param_driver />
     </param>
     <param
-     id="10004"
+     id="10005"
      group="0"
      sex="female"
      name="Breast_Physics_UpDown_Spring"
@@ -11853,7 +11867,7 @@ render_pass="bump">
 	 <param_driver />
     </param>
     <param
-     id="10005"
+     id="10006"
      group="0"
      sex="female"
      name="Breast_Physics_UpDown_Gain"
@@ -11866,7 +11880,7 @@ render_pass="bump">
 	 <param_driver />
     </param>
     <param
-     id="10006"
+     id="10007"
      group="0"
      sex="female"
      name="Breast_Physics_UpDown_Damping"
@@ -11880,19 +11894,6 @@ render_pass="bump">
      camera_distance=".8">
 	 <param_driver />
     </param>
-   <param
-     id="10007"
-     group="0"
-     sex="female"
-     name="Breast_Physics_UpDown_Drag"
-     label="Breast Physics UpDown Drag"
-     wearable="physics"
-     edit_group="physics_advanced"
-     value_default=".15"
-     value_min="0"
-     value_max=".5">
-	 <param_driver />
-    </param>
 
    <param
      id="10008"
@@ -11946,22 +11947,9 @@ render_pass="bump">
      value_max=".1">
 	 <param_driver />
     </param>
-   <param
-     id="10012"
-     group="0"
-     sex="female"
-     name="Breast_Physics_InOut_Drag"
-     label="Breast Physics InOut Drag"
-     wearable="physics"
-     edit_group="physics_advanced"
-     value_default=".15"
-     value_min="0"
-     value_max=".5">
-	 <param_driver />
-    </param>
 
     <param
-     id="10013"
+     id="10012"
      group="0"
      name="Belly_Physics_Mass"
      label="Belly Physics Mass"
@@ -11973,7 +11961,7 @@ render_pass="bump">
 	 <param_driver />
     </param>
     <param
-     id="10014"
+     id="10013"
      group="0"
      name="Belly_Physics_Smoothing"
      label="Belly Physics Smoothing"
@@ -11985,7 +11973,7 @@ render_pass="bump">
 	 <param_driver />
     </param>
     <param
-     id="10015"
+     id="10014"
      group="0"
      name="Belly_Physics_Gravity"
      label="Belly Physics Gravity"
@@ -11997,6 +11985,18 @@ render_pass="bump">
 	 <param_driver />
     </param>
    <param
+     id="10015"
+     group="0"
+     name="Belly_Physics_Drag"
+     label="Belly Physics Drag"
+     wearable="physics"
+     edit_group="physics_advanced"
+     value_default=".15"
+     value_min="0"
+     value_max=".5">
+	 <param_driver />
+    </param>
+   <param
      id="10016"
      group="0"
      name="Belly_Physics_UpDown_Max_Velocity"
@@ -12044,21 +12044,9 @@ render_pass="bump">
      value_max=".1">
 	 <param_driver />
     </param>
-   <param
-     id="10020"
-     group="0"
-     name="Belly_Physics_UpDown_Drag"
-     label="Belly Physics UpDown Drag"
-     wearable="physics"
-     edit_group="physics_advanced"
-     value_default=".15"
-     value_min="0"
-     value_max=".5">
-	 <param_driver />
-    </param>
 
     <param
-     id="10021"
+     id="10020"
      group="0"
      name="Butt_Physics_Mass"
      label="Butt Physics Mass"
@@ -12070,7 +12058,7 @@ render_pass="bump">
 	 <param_driver />
     </param>
     <param
-     id="10022"
+     id="10021"
      group="0"
      name="Butt_Physics_Smoothing"
      label="Butt Physics Smoothing"
@@ -12082,7 +12070,7 @@ render_pass="bump">
 	 <param_driver />
     </param>
     <param
-     id="10023"
+     id="10022"
      group="0"
      name="Butt_Physics_Gravity"
      label="Butt Physics Gravity"
@@ -12094,6 +12082,19 @@ render_pass="bump">
 	 <param_driver />
     </param>
    <param
+     id="10023"
+     group="0"
+     name="Butt_Physics_Drag"
+     label="Butt Physics Drag"
+     wearable="physics"
+     edit_group="physics_advanced"
+     value_default=".15"
+     value_min="0"
+     value_max=".5">
+	 <param_driver />
+    </param>
+
+   <param
      id="10024"
      group="0"
      name="Butt_Physics_UpDown_Max_Velocity"
@@ -12141,21 +12142,9 @@ render_pass="bump">
      value_max=".1">
 	 <param_driver />
     </param>
-   <param
-     id="10028"
-     group="0"
-     name="Butt_Physics_UpDown_Drag"
-     label="Butt Physics UpDown Drag"
-     wearable="physics"
-     edit_group="physics_advanced"
-     value_default=".15"
-     value_min="0"
-     value_max=".5">
-	 <param_driver />
-    </param>
 
    <param
-     id="10029"
+     id="10028"
      group="0"
      name="Butt_Physics_LeftRight_Max_Velocity"
      label="Butt Physics LeftRight Max Speed"
@@ -12167,7 +12156,7 @@ render_pass="bump">
 	 <param_driver />
     </param>
     <param
-     id="10030"
+     id="10029"
      group="0"
      name="Butt_Physics_LeftRight_Spring"
      label="Butt Physics LeftRight Spring"
@@ -12179,7 +12168,7 @@ render_pass="bump">
 	 <param_driver />
     </param>
     <param
-     id="10031"
+     id="10030"
      group="0"
      name="Butt_Physics_LeftRight_Gain"
      label="Butt Physics LeftRight Gain"
@@ -12191,7 +12180,7 @@ render_pass="bump">
 	 <param_driver />
     </param>
     <param
-     id="10032"
+     id="10031"
      group="0"
      name="Butt_Physics_LeftRight_Damping"
      label="Butt Physics LeftRight Damping"
@@ -12202,18 +12191,6 @@ render_pass="bump">
      value_max=".1">
 	 <param_driver />
     </param>
-   <param
-     id="10033"
-     group="0"
-     name="Butt_Physics_LeftRight_Drag"
-     label="Butt Physics LeftRight Drag"
-     wearable="physics"
-     edit_group="physics_advanced"
-     value_default=".15"
-     value_min="0"
-     value_max=".5">
-	 <param_driver />
-    </param>
 
   </driver_parameters>
 
diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp
index a2510a10c1..d0ce765a69 100644
--- a/indra/newview/llpaneleditwearable.cpp
+++ b/indra/newview/llpaneleditwearable.cpp
@@ -51,7 +51,7 @@
 #include "llcolorswatch.h"
 #include "lltexturectrl.h"
 #include "lltextureentry.h"
-#include "llviewercontrol.h"	// gSavedSettings
+#include "llviewercontrol.h"    // gSavedSettings
 #include "llviewertexturelist.h"
 #include "llagentcamera.h"
 #include "llmorphview.h"
@@ -65,42 +65,42 @@ static LLRegisterPanelClassWrapper<LLPanelEditWearable> t_edit_wearable("panel_e
 
 // subparts of the UI for focus, camera position, etc.
 enum ESubpart {
-	SUBPART_SHAPE_HEAD = 1, // avoid 0
-	SUBPART_SHAPE_EYES,
-	SUBPART_SHAPE_EARS,
-	SUBPART_SHAPE_NOSE,
-	SUBPART_SHAPE_MOUTH,
-	SUBPART_SHAPE_CHIN,
-	SUBPART_SHAPE_TORSO,
-	SUBPART_SHAPE_LEGS,
-	SUBPART_SHAPE_WHOLE,
-	SUBPART_SHAPE_DETAIL,
-	SUBPART_SKIN_COLOR,
-	SUBPART_SKIN_FACEDETAIL,
-	SUBPART_SKIN_MAKEUP,
-	SUBPART_SKIN_BODYDETAIL,
-	SUBPART_HAIR_COLOR,
-	SUBPART_HAIR_STYLE,
-	SUBPART_HAIR_EYEBROWS,
-	SUBPART_HAIR_FACIAL,
-	SUBPART_EYES,
-	SUBPART_SHIRT,
-	SUBPART_PANTS,
-	SUBPART_SHOES,
-	SUBPART_SOCKS,
-	SUBPART_JACKET,
-	SUBPART_GLOVES,
-	SUBPART_UNDERSHIRT,
-	SUBPART_UNDERPANTS,
-	SUBPART_SKIRT,
-	SUBPART_ALPHA,
-	SUBPART_TATTOO,
-	SUBPART_PHYSICS_BREASTS_UPDOWN,
-	SUBPART_PHYSICS_BREASTS_INOUT,
-	SUBPART_PHYSICS_BELLY_UPDOWN,
-	SUBPART_PHYSICS_BUTT_UPDOWN,
-	SUBPART_PHYSICS_BUTT_LEFTRIGHT,
-	SUBPART_PHYSICS_ADVANCED,
+        SUBPART_SHAPE_HEAD = 1, // avoid 0
+        SUBPART_SHAPE_EYES,
+        SUBPART_SHAPE_EARS,
+        SUBPART_SHAPE_NOSE,
+        SUBPART_SHAPE_MOUTH,
+        SUBPART_SHAPE_CHIN,
+        SUBPART_SHAPE_TORSO,
+        SUBPART_SHAPE_LEGS,
+        SUBPART_SHAPE_WHOLE,
+        SUBPART_SHAPE_DETAIL,
+        SUBPART_SKIN_COLOR,
+        SUBPART_SKIN_FACEDETAIL,
+        SUBPART_SKIN_MAKEUP,
+        SUBPART_SKIN_BODYDETAIL,
+        SUBPART_HAIR_COLOR,
+        SUBPART_HAIR_STYLE,
+        SUBPART_HAIR_EYEBROWS,
+        SUBPART_HAIR_FACIAL,
+        SUBPART_EYES,
+        SUBPART_SHIRT,
+        SUBPART_PANTS,
+        SUBPART_SHOES,
+        SUBPART_SOCKS,
+        SUBPART_JACKET,
+        SUBPART_GLOVES,
+        SUBPART_UNDERSHIRT,
+        SUBPART_UNDERPANTS,
+        SUBPART_SKIRT,
+        SUBPART_ALPHA,
+        SUBPART_TATTOO,
+        SUBPART_PHYSICS_BREASTS_UPDOWN,
+        SUBPART_PHYSICS_BREASTS_INOUT,
+        SUBPART_PHYSICS_BELLY_UPDOWN,
+        SUBPART_PHYSICS_BUTT_UPDOWN,
+        SUBPART_PHYSICS_BUTT_LEFTRIGHT,
+        SUBPART_PHYSICS_ADVANCED,
  };
 
 using namespace LLVOAvatarDefines;
@@ -111,102 +111,102 @@ typedef std::vector<ESubpart> subpart_vec_t;
 
 class LLEditWearableDictionary : public LLSingleton<LLEditWearableDictionary>
 {
-	//--------------------------------------------------------------------
-	// Constructors and Destructors
-	//--------------------------------------------------------------------
+        //--------------------------------------------------------------------
+        // Constructors and Destructors
+        //--------------------------------------------------------------------
 public:
-	LLEditWearableDictionary();
-	virtual ~LLEditWearableDictionary();
-	
-	//--------------------------------------------------------------------
-	// Wearable Types
-	//--------------------------------------------------------------------
+        LLEditWearableDictionary();
+        virtual ~LLEditWearableDictionary();
+        
+        //--------------------------------------------------------------------
+        // Wearable Types
+        //--------------------------------------------------------------------
 public:
-	struct WearableEntry : public LLDictionaryEntry
-	{
-		WearableEntry(LLWearableType::EType type,
-					  const std::string &title,
-					  const std::string &desc_title,
-					  U8 num_color_swatches,  // number of 'color_swatches'
-					  U8 num_texture_pickers, // number of 'texture_pickers'
-					  U8 num_subparts, ... ); // number of subparts followed by a list of ETextureIndex and ESubparts
-
-
-		const LLWearableType::EType mWearableType;
-		const std::string   mTitle;
-		const std::string	mDescTitle;
-		subpart_vec_t		mSubparts;
-		texture_vec_t		mColorSwatchCtrls;
-		texture_vec_t		mTextureCtrls;
-	};
-
-	struct Wearables : public LLDictionary<LLWearableType::EType, WearableEntry>
-	{
-		Wearables();
-	} mWearables;
-
-	const WearableEntry*	getWearable(LLWearableType::EType type) const { return mWearables.lookup(type); }
-
-	//--------------------------------------------------------------------
-	// Subparts
-	//--------------------------------------------------------------------
+        struct WearableEntry : public LLDictionaryEntry
+        {
+                WearableEntry(LLWearableType::EType type,
+                                          const std::string &title,
+                                          const std::string &desc_title,
+                                          U8 num_color_swatches,  // number of 'color_swatches'
+                                          U8 num_texture_pickers, // number of 'texture_pickers'
+                                          U8 num_subparts, ... ); // number of subparts followed by a list of ETextureIndex and ESubparts
+
+
+                const LLWearableType::EType mWearableType;
+                const std::string   mTitle;
+                const std::string       mDescTitle;
+                subpart_vec_t           mSubparts;
+                texture_vec_t           mColorSwatchCtrls;
+                texture_vec_t           mTextureCtrls;
+        };
+
+        struct Wearables : public LLDictionary<LLWearableType::EType, WearableEntry>
+        {
+                Wearables();
+        } mWearables;
+
+        const WearableEntry*    getWearable(LLWearableType::EType type) const { return mWearables.lookup(type); }
+
+        //--------------------------------------------------------------------
+        // Subparts
+        //--------------------------------------------------------------------
 public:
-	struct SubpartEntry : public LLDictionaryEntry
-	{
-		SubpartEntry(ESubpart part,
-					 const std::string &joint,
-					 const std::string &edit_group,
-					 const std::string &param_list,
-					 const std::string &accordion_tab,
-					 const LLVector3d  &target_offset,
-					 const LLVector3d  &camera_offset,
-					 const ESex 	   &sex);
-
-		ESubpart			mSubpart;
-		std::string			mTargetJoint;
-		std::string			mEditGroup;
-		std::string			mParamList;
-		std::string			mAccordionTab;
-		LLVector3d			mTargetOffset;
-		LLVector3d			mCameraOffset;
-		ESex				mSex;
-	};
-
-	struct Subparts : public LLDictionary<ESubpart, SubpartEntry>
-	{
-		Subparts();
-	} mSubparts;
-
-	const SubpartEntry*  getSubpart(ESubpart subpart) const { return mSubparts.lookup(subpart); }
-
-	//--------------------------------------------------------------------
-	// Picker Control Entries
-	//--------------------------------------------------------------------
+        struct SubpartEntry : public LLDictionaryEntry
+        {
+                SubpartEntry(ESubpart part,
+                                         const std::string &joint,
+                                         const std::string &edit_group,
+                                         const std::string &param_list,
+                                         const std::string &accordion_tab,
+                                         const LLVector3d  &target_offset,
+                                         const LLVector3d  &camera_offset,
+                                         const ESex        &sex);
+
+                ESubpart                        mSubpart;
+                std::string                     mTargetJoint;
+                std::string                     mEditGroup;
+                std::string                     mParamList;
+                std::string                     mAccordionTab;
+                LLVector3d                      mTargetOffset;
+                LLVector3d                      mCameraOffset;
+                ESex                            mSex;
+        };
+
+        struct Subparts : public LLDictionary<ESubpart, SubpartEntry>
+        {
+                Subparts();
+        } mSubparts;
+
+        const SubpartEntry*  getSubpart(ESubpart subpart) const { return mSubparts.lookup(subpart); }
+
+        //--------------------------------------------------------------------
+        // Picker Control Entries
+        //--------------------------------------------------------------------
 public:
-	struct PickerControlEntry : public LLDictionaryEntry
-	{
-		PickerControlEntry(ETextureIndex tex_index,
-						   const std::string name,
-						   const LLUUID default_image_id = LLUUID::null,
-						   const bool allow_no_texture = false);
-		ETextureIndex		mTextureIndex;
-		const std::string	mControlName;
-		const LLUUID		mDefaultImageId;
-		const bool			mAllowNoTexture;
-	};
-
-	struct ColorSwatchCtrls : public LLDictionary<ETextureIndex, PickerControlEntry>
-	{
-		ColorSwatchCtrls();
-	} mColorSwatchCtrls;
-
-	struct TextureCtrls : public LLDictionary<ETextureIndex, PickerControlEntry>
-	{
-		TextureCtrls();
-	} mTextureCtrls;
-
-	const PickerControlEntry* getTexturePicker(ETextureIndex index) const { return mTextureCtrls.lookup(index); }
-	const PickerControlEntry* getColorSwatch(ETextureIndex index) const { return mColorSwatchCtrls.lookup(index); }
+        struct PickerControlEntry : public LLDictionaryEntry
+        {
+                PickerControlEntry(ETextureIndex tex_index,
+                                                   const std::string name,
+                                                   const LLUUID default_image_id = LLUUID::null,
+                                                   const bool allow_no_texture = false);
+                ETextureIndex           mTextureIndex;
+                const std::string       mControlName;
+                const LLUUID            mDefaultImageId;
+                const bool                      mAllowNoTexture;
+        };
+
+        struct ColorSwatchCtrls : public LLDictionary<ETextureIndex, PickerControlEntry>
+        {
+                ColorSwatchCtrls();
+        } mColorSwatchCtrls;
+
+        struct TextureCtrls : public LLDictionary<ETextureIndex, PickerControlEntry>
+        {
+                TextureCtrls();
+        } mTextureCtrls;
+
+        const PickerControlEntry* getTexturePicker(ETextureIndex index) const { return mTextureCtrls.lookup(index); }
+        const PickerControlEntry* getColorSwatch(ETextureIndex index) const { return mColorSwatchCtrls.lookup(index); }
 };
 
 LLEditWearableDictionary::LLEditWearableDictionary()
@@ -221,173 +221,173 @@ LLEditWearableDictionary::~LLEditWearableDictionary()
 
 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,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));
-	addEntry(LLWearableType::WT_SHIRT, 		new WearableEntry(LLWearableType::WT_SHIRT,"edit_shirt_title","shirt_desc_text",1,1,1, TEX_UPPER_SHIRT, TEX_UPPER_SHIRT, SUBPART_SHIRT));
-	addEntry(LLWearableType::WT_PANTS, 		new WearableEntry(LLWearableType::WT_PANTS,"edit_pants_title","pants_desc_text",1,1,1, TEX_LOWER_PANTS, TEX_LOWER_PANTS, SUBPART_PANTS));
-	addEntry(LLWearableType::WT_SHOES, 		new WearableEntry(LLWearableType::WT_SHOES,"edit_shoes_title","shoes_desc_text",1,1,1, TEX_LOWER_SHOES, TEX_LOWER_SHOES, SUBPART_SHOES));
-	addEntry(LLWearableType::WT_SOCKS, 		new WearableEntry(LLWearableType::WT_SOCKS,"edit_socks_title","socks_desc_text",1,1,1, TEX_LOWER_SOCKS, TEX_LOWER_SOCKS, SUBPART_SOCKS));
-	addEntry(LLWearableType::WT_JACKET, 	new WearableEntry(LLWearableType::WT_JACKET,"edit_jacket_title","jacket_desc_text",1,2,1, TEX_UPPER_JACKET, TEX_UPPER_JACKET, TEX_LOWER_JACKET, SUBPART_JACKET));
-	addEntry(LLWearableType::WT_GLOVES, 	new WearableEntry(LLWearableType::WT_GLOVES,"edit_gloves_title","gloves_desc_text",1,1,1, TEX_UPPER_GLOVES, TEX_UPPER_GLOVES, SUBPART_GLOVES));
-	addEntry(LLWearableType::WT_UNDERSHIRT, new WearableEntry(LLWearableType::WT_UNDERSHIRT,"edit_undershirt_title","undershirt_desc_text",1,1,1, TEX_UPPER_UNDERSHIRT, TEX_UPPER_UNDERSHIRT, SUBPART_UNDERSHIRT));
-	addEntry(LLWearableType::WT_UNDERPANTS, new WearableEntry(LLWearableType::WT_UNDERPANTS,"edit_underpants_title","underpants_desc_text",1,1,1, TEX_LOWER_UNDERPANTS, TEX_LOWER_UNDERPANTS, SUBPART_UNDERPANTS));
-	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,6, SUBPART_PHYSICS_BREASTS_UPDOWN, SUBPART_PHYSICS_BREASTS_INOUT, SUBPART_PHYSICS_BELLY_UPDOWN, SUBPART_PHYSICS_BUTT_UPDOWN, SUBPART_PHYSICS_BUTT_LEFTRIGHT, SUBPART_PHYSICS_ADVANCED));
+        // 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,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));
+        addEntry(LLWearableType::WT_SHIRT,              new WearableEntry(LLWearableType::WT_SHIRT,"edit_shirt_title","shirt_desc_text",1,1,1, TEX_UPPER_SHIRT, TEX_UPPER_SHIRT, SUBPART_SHIRT));
+        addEntry(LLWearableType::WT_PANTS,              new WearableEntry(LLWearableType::WT_PANTS,"edit_pants_title","pants_desc_text",1,1,1, TEX_LOWER_PANTS, TEX_LOWER_PANTS, SUBPART_PANTS));
+        addEntry(LLWearableType::WT_SHOES,              new WearableEntry(LLWearableType::WT_SHOES,"edit_shoes_title","shoes_desc_text",1,1,1, TEX_LOWER_SHOES, TEX_LOWER_SHOES, SUBPART_SHOES));
+        addEntry(LLWearableType::WT_SOCKS,              new WearableEntry(LLWearableType::WT_SOCKS,"edit_socks_title","socks_desc_text",1,1,1, TEX_LOWER_SOCKS, TEX_LOWER_SOCKS, SUBPART_SOCKS));
+        addEntry(LLWearableType::WT_JACKET,     new WearableEntry(LLWearableType::WT_JACKET,"edit_jacket_title","jacket_desc_text",1,2,1, TEX_UPPER_JACKET, TEX_UPPER_JACKET, TEX_LOWER_JACKET, SUBPART_JACKET));
+        addEntry(LLWearableType::WT_GLOVES,     new WearableEntry(LLWearableType::WT_GLOVES,"edit_gloves_title","gloves_desc_text",1,1,1, TEX_UPPER_GLOVES, TEX_UPPER_GLOVES, SUBPART_GLOVES));
+        addEntry(LLWearableType::WT_UNDERSHIRT, new WearableEntry(LLWearableType::WT_UNDERSHIRT,"edit_undershirt_title","undershirt_desc_text",1,1,1, TEX_UPPER_UNDERSHIRT, TEX_UPPER_UNDERSHIRT, SUBPART_UNDERSHIRT));
+        addEntry(LLWearableType::WT_UNDERPANTS, new WearableEntry(LLWearableType::WT_UNDERPANTS,"edit_underpants_title","underpants_desc_text",1,1,1, TEX_LOWER_UNDERPANTS, TEX_LOWER_UNDERPANTS, SUBPART_UNDERPANTS));
+        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,6, SUBPART_PHYSICS_BREASTS_UPDOWN, SUBPART_PHYSICS_BREASTS_INOUT, SUBPART_PHYSICS_BELLY_UPDOWN, SUBPART_PHYSICS_BUTT_UPDOWN, SUBPART_PHYSICS_BUTT_LEFTRIGHT, SUBPART_PHYSICS_ADVANCED));
 }
 
 LLEditWearableDictionary::WearableEntry::WearableEntry(LLWearableType::EType type,
-					  const std::string &title,
-					  const std::string &desc_title,
-					  U8 num_color_swatches,
-					  U8 num_texture_pickers,
-					  U8 num_subparts, ... ) :
-	LLDictionaryEntry(title),
-	mWearableType(type),
-	mTitle(title),
-	mDescTitle(desc_title)
-{
-	va_list argp;
-	va_start(argp, num_subparts);
-
-	for (U8 i = 0; i < num_color_swatches; ++i)
-	{
-		ETextureIndex index = (ETextureIndex)va_arg(argp,int);
-		mColorSwatchCtrls.push_back(index);
-	}
-
-	for (U8 i = 0; i < num_texture_pickers; ++i)
-	{
-		ETextureIndex index = (ETextureIndex)va_arg(argp,int);
-		mTextureCtrls.push_back(index);
-	}
-
-	for (U8 i = 0; i < num_subparts; ++i)
-	{
-		ESubpart part = (ESubpart)va_arg(argp,int);
-		mSubparts.push_back(part);
-	}
+                                          const std::string &title,
+                                          const std::string &desc_title,
+                                          U8 num_color_swatches,
+                                          U8 num_texture_pickers,
+                                          U8 num_subparts, ... ) :
+        LLDictionaryEntry(title),
+        mWearableType(type),
+        mTitle(title),
+        mDescTitle(desc_title)
+{
+        va_list argp;
+        va_start(argp, num_subparts);
+
+        for (U8 i = 0; i < num_color_swatches; ++i)
+        {
+                ETextureIndex index = (ETextureIndex)va_arg(argp,int);
+                mColorSwatchCtrls.push_back(index);
+        }
+
+        for (U8 i = 0; i < num_texture_pickers; ++i)
+        {
+                ETextureIndex index = (ETextureIndex)va_arg(argp,int);
+                mTextureCtrls.push_back(index);
+        }
+
+        for (U8 i = 0; i < num_subparts; ++i)
+        {
+                ESubpart part = (ESubpart)va_arg(argp,int);
+                mSubparts.push_back(part);
+        }
 }
 
 LLEditWearableDictionary::Subparts::Subparts()
 {
-	addEntry(SUBPART_SHAPE_WHOLE, new SubpartEntry(SUBPART_SHAPE_WHOLE, "mPelvis", "shape_body","shape_body_param_list", "shape_body_tab", LLVector3d(0.f, 0.f, 0.1f), LLVector3d(-2.5f, 0.5f, 0.8f),SEX_BOTH));
-	addEntry(SUBPART_SHAPE_HEAD, new SubpartEntry(SUBPART_SHAPE_HEAD, "mHead", "shape_head", "shape_head_param_list", "shape_head_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
-	addEntry(SUBPART_SHAPE_EYES, new SubpartEntry(SUBPART_SHAPE_EYES, "mHead", "shape_eyes", "shape_eyes_param_list", "shape_eyes_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
-	addEntry(SUBPART_SHAPE_EARS, new SubpartEntry(SUBPART_SHAPE_EARS, "mHead", "shape_ears", "shape_ears_param_list", "shape_ears_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
-	addEntry(SUBPART_SHAPE_NOSE, new SubpartEntry(SUBPART_SHAPE_NOSE, "mHead", "shape_nose", "shape_nose_param_list", "shape_nose_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
-	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_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));
-	addEntry(SUBPART_SKIN_FACEDETAIL, new SubpartEntry(SUBPART_SKIN_FACEDETAIL, "mHead", "skin_facedetail", "skin_face_param_list", "skin_face_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
-	addEntry(SUBPART_SKIN_MAKEUP, new SubpartEntry(SUBPART_SKIN_MAKEUP, "mHead", "skin_makeup", "skin_makeup_param_list", "skin_makeup_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
-	addEntry(SUBPART_SKIN_BODYDETAIL, new SubpartEntry(SUBPART_SKIN_BODYDETAIL, "mPelvis", "skin_bodydetail", "skin_body_param_list", "skin_body_tab", LLVector3d(0.f, 0.f, -0.2f), LLVector3d(-2.5f, 0.5f, 0.5f),SEX_BOTH));
-
-	addEntry(SUBPART_HAIR_COLOR, new SubpartEntry(SUBPART_HAIR_COLOR, "mHead", "hair_color", "hair_color_param_list", "hair_color_tab", LLVector3d(0.f, 0.f, 0.10f), LLVector3d(-0.4f, 0.05f, 0.10f),SEX_BOTH));
-	addEntry(SUBPART_HAIR_STYLE, new SubpartEntry(SUBPART_HAIR_STYLE, "mHead", "hair_style", "hair_style_param_list", "hair_style_tab", LLVector3d(0.f, 0.f, 0.10f), LLVector3d(-0.4f, 0.05f, 0.10f),SEX_BOTH));
-	addEntry(SUBPART_HAIR_EYEBROWS, new SubpartEntry(SUBPART_HAIR_EYEBROWS, "mHead", "hair_eyebrows", "hair_eyebrows_param_list", "hair_eyebrows_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
-	addEntry(SUBPART_HAIR_FACIAL, new SubpartEntry(SUBPART_HAIR_FACIAL, "mHead", "hair_facial", "hair_facial_param_list", "hair_facial_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_MALE));
-
-	addEntry(SUBPART_EYES, new SubpartEntry(SUBPART_EYES, "mHead", "eyes", "eyes_main_param_list", "eyes_main_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
-
-	addEntry(SUBPART_SHIRT, new SubpartEntry(SUBPART_SHIRT, "mTorso", "shirt", "shirt_main_param_list", "shirt_main_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(-1.f, 0.15f, 0.3f),SEX_BOTH));
-	addEntry(SUBPART_PANTS, new SubpartEntry(SUBPART_PANTS, "mPelvis", "pants", "pants_main_param_list", "pants_main_tab", LLVector3d(0.f, 0.f, -0.5f), LLVector3d(-1.6f, 0.15f, -0.5f),SEX_BOTH));
-	addEntry(SUBPART_SHOES, new SubpartEntry(SUBPART_SHOES, "mPelvis", "shoes", "shoes_main_param_list", "shoes_main_tab", LLVector3d(0.f, 0.f, -0.5f), LLVector3d(-1.6f, 0.15f, -0.5f),SEX_BOTH));
-	addEntry(SUBPART_SOCKS, new SubpartEntry(SUBPART_SOCKS, "mPelvis", "socks", "socks_main_param_list", "socks_main_tab", LLVector3d(0.f, 0.f, -0.5f), LLVector3d(-1.6f, 0.15f, -0.5f),SEX_BOTH));
-	addEntry(SUBPART_JACKET, new SubpartEntry(SUBPART_JACKET, "mTorso", "jacket", "jacket_main_param_list", "jacket_main_tab", LLVector3d(0.f, 0.f, 0.f), LLVector3d(-2.f, 0.1f, 0.3f),SEX_BOTH));
-	addEntry(SUBPART_SKIRT, new SubpartEntry(SUBPART_SKIRT, "mPelvis", "skirt", "skirt_main_param_list", "skirt_main_tab", LLVector3d(0.f, 0.f, -0.5f), LLVector3d(-1.6f, 0.15f, -0.5f),SEX_BOTH));
-	addEntry(SUBPART_GLOVES, new SubpartEntry(SUBPART_GLOVES, "mTorso", "gloves", "gloves_main_param_list", "gloves_main_tab", LLVector3d(0.f, 0.f, 0.f), LLVector3d(-1.f, 0.15f, 0.f),SEX_BOTH));
-	addEntry(SUBPART_UNDERSHIRT, new SubpartEntry(SUBPART_UNDERSHIRT, "mTorso", "undershirt", "undershirt_main_param_list", "undershirt_main_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(-1.f, 0.15f, 0.3f),SEX_BOTH));
-	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_BREASTS_UPDOWN, new SubpartEntry(SUBPART_PHYSICS_BREASTS_UPDOWN, "mTorso", "physics_breasts_updown_tab", "physics_breasts_updown_param_list", "physics_breasts_updown_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_FEMALE));
-	addEntry(SUBPART_PHYSICS_BREASTS_INOUT, new SubpartEntry(SUBPART_PHYSICS_BREASTS_INOUT, "mTorso", "physics_breasts_inout_tab", "physics_breasts_inout_param_list", "physics_breasts_inout_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_FEMALE));
-	addEntry(SUBPART_PHYSICS_BELLY_UPDOWN, new SubpartEntry(SUBPART_PHYSICS_BELLY_UPDOWN, "mTorso", "physics_belly_updown_tab", "physics_belly_updown_param_list", "physics_belly_updown_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH));
-	addEntry(SUBPART_PHYSICS_BUTT_UPDOWN, new SubpartEntry(SUBPART_PHYSICS_BUTT_UPDOWN, "mTorso", "physics_butt_updown_tab", "physics_butt_updown_param_list", "physics_butt_updown_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH));
-	addEntry(SUBPART_PHYSICS_BUTT_LEFTRIGHT, new SubpartEntry(SUBPART_PHYSICS_BUTT_LEFTRIGHT, "mTorso", "physics_butt_leftright_tab", "physics_butt_leftright_param_list", "physics_butt_leftright_tab", LLVector3d(0.f, 0.f, 0.f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH));
-	addEntry(SUBPART_PHYSICS_ADVANCED, new SubpartEntry(SUBPART_PHYSICS_ADVANCED, "mTorso", "physics_advanced_tab", "physics_advanced_param_list", "physics_advanced_tab", LLVector3d(0.f, 0.f, 0.f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH));
+        addEntry(SUBPART_SHAPE_WHOLE, new SubpartEntry(SUBPART_SHAPE_WHOLE, "mPelvis", "shape_body","shape_body_param_list", "shape_body_tab", LLVector3d(0.f, 0.f, 0.1f), LLVector3d(-2.5f, 0.5f, 0.8f),SEX_BOTH));
+        addEntry(SUBPART_SHAPE_HEAD, new SubpartEntry(SUBPART_SHAPE_HEAD, "mHead", "shape_head", "shape_head_param_list", "shape_head_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
+        addEntry(SUBPART_SHAPE_EYES, new SubpartEntry(SUBPART_SHAPE_EYES, "mHead", "shape_eyes", "shape_eyes_param_list", "shape_eyes_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
+        addEntry(SUBPART_SHAPE_EARS, new SubpartEntry(SUBPART_SHAPE_EARS, "mHead", "shape_ears", "shape_ears_param_list", "shape_ears_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
+        addEntry(SUBPART_SHAPE_NOSE, new SubpartEntry(SUBPART_SHAPE_NOSE, "mHead", "shape_nose", "shape_nose_param_list", "shape_nose_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
+        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_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));
+        addEntry(SUBPART_SKIN_FACEDETAIL, new SubpartEntry(SUBPART_SKIN_FACEDETAIL, "mHead", "skin_facedetail", "skin_face_param_list", "skin_face_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
+        addEntry(SUBPART_SKIN_MAKEUP, new SubpartEntry(SUBPART_SKIN_MAKEUP, "mHead", "skin_makeup", "skin_makeup_param_list", "skin_makeup_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
+        addEntry(SUBPART_SKIN_BODYDETAIL, new SubpartEntry(SUBPART_SKIN_BODYDETAIL, "mPelvis", "skin_bodydetail", "skin_body_param_list", "skin_body_tab", LLVector3d(0.f, 0.f, -0.2f), LLVector3d(-2.5f, 0.5f, 0.5f),SEX_BOTH));
+
+        addEntry(SUBPART_HAIR_COLOR, new SubpartEntry(SUBPART_HAIR_COLOR, "mHead", "hair_color", "hair_color_param_list", "hair_color_tab", LLVector3d(0.f, 0.f, 0.10f), LLVector3d(-0.4f, 0.05f, 0.10f),SEX_BOTH));
+        addEntry(SUBPART_HAIR_STYLE, new SubpartEntry(SUBPART_HAIR_STYLE, "mHead", "hair_style", "hair_style_param_list", "hair_style_tab", LLVector3d(0.f, 0.f, 0.10f), LLVector3d(-0.4f, 0.05f, 0.10f),SEX_BOTH));
+        addEntry(SUBPART_HAIR_EYEBROWS, new SubpartEntry(SUBPART_HAIR_EYEBROWS, "mHead", "hair_eyebrows", "hair_eyebrows_param_list", "hair_eyebrows_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
+        addEntry(SUBPART_HAIR_FACIAL, new SubpartEntry(SUBPART_HAIR_FACIAL, "mHead", "hair_facial", "hair_facial_param_list", "hair_facial_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_MALE));
+
+        addEntry(SUBPART_EYES, new SubpartEntry(SUBPART_EYES, "mHead", "eyes", "eyes_main_param_list", "eyes_main_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
+
+        addEntry(SUBPART_SHIRT, new SubpartEntry(SUBPART_SHIRT, "mTorso", "shirt", "shirt_main_param_list", "shirt_main_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(-1.f, 0.15f, 0.3f),SEX_BOTH));
+        addEntry(SUBPART_PANTS, new SubpartEntry(SUBPART_PANTS, "mPelvis", "pants", "pants_main_param_list", "pants_main_tab", LLVector3d(0.f, 0.f, -0.5f), LLVector3d(-1.6f, 0.15f, -0.5f),SEX_BOTH));
+        addEntry(SUBPART_SHOES, new SubpartEntry(SUBPART_SHOES, "mPelvis", "shoes", "shoes_main_param_list", "shoes_main_tab", LLVector3d(0.f, 0.f, -0.5f), LLVector3d(-1.6f, 0.15f, -0.5f),SEX_BOTH));
+        addEntry(SUBPART_SOCKS, new SubpartEntry(SUBPART_SOCKS, "mPelvis", "socks", "socks_main_param_list", "socks_main_tab", LLVector3d(0.f, 0.f, -0.5f), LLVector3d(-1.6f, 0.15f, -0.5f),SEX_BOTH));
+        addEntry(SUBPART_JACKET, new SubpartEntry(SUBPART_JACKET, "mTorso", "jacket", "jacket_main_param_list", "jacket_main_tab", LLVector3d(0.f, 0.f, 0.f), LLVector3d(-2.f, 0.1f, 0.3f),SEX_BOTH));
+        addEntry(SUBPART_SKIRT, new SubpartEntry(SUBPART_SKIRT, "mPelvis", "skirt", "skirt_main_param_list", "skirt_main_tab", LLVector3d(0.f, 0.f, -0.5f), LLVector3d(-1.6f, 0.15f, -0.5f),SEX_BOTH));
+        addEntry(SUBPART_GLOVES, new SubpartEntry(SUBPART_GLOVES, "mTorso", "gloves", "gloves_main_param_list", "gloves_main_tab", LLVector3d(0.f, 0.f, 0.f), LLVector3d(-1.f, 0.15f, 0.f),SEX_BOTH));
+        addEntry(SUBPART_UNDERSHIRT, new SubpartEntry(SUBPART_UNDERSHIRT, "mTorso", "undershirt", "undershirt_main_param_list", "undershirt_main_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(-1.f, 0.15f, 0.3f),SEX_BOTH));
+        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_BREASTS_UPDOWN, new SubpartEntry(SUBPART_PHYSICS_BREASTS_UPDOWN, "mTorso", "physics_breasts_updown", "physics_breasts_updown_param_list", "physics_breasts_updown_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_FEMALE));
+        addEntry(SUBPART_PHYSICS_BREASTS_INOUT, new SubpartEntry(SUBPART_PHYSICS_BREASTS_INOUT, "mTorso", "physics_breasts_inout", "physics_breasts_inout_param_list", "physics_breasts_inout_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_FEMALE));
+        addEntry(SUBPART_PHYSICS_BELLY_UPDOWN, new SubpartEntry(SUBPART_PHYSICS_BELLY_UPDOWN, "mTorso", "physics_belly_updown", "physics_belly_updown_param_list", "physics_belly_updown_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH));
+        addEntry(SUBPART_PHYSICS_BUTT_UPDOWN, new SubpartEntry(SUBPART_PHYSICS_BUTT_UPDOWN, "mTorso", "physics_butt_updown", "physics_butt_updown_param_list", "physics_butt_updown_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH));
+        addEntry(SUBPART_PHYSICS_BUTT_LEFTRIGHT, new SubpartEntry(SUBPART_PHYSICS_BUTT_LEFTRIGHT, "mTorso", "physics_butt_leftright", "physics_butt_leftright_param_list", "physics_butt_leftright_tab", LLVector3d(0.f, 0.f, 0.f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH));
+        addEntry(SUBPART_PHYSICS_ADVANCED, new SubpartEntry(SUBPART_PHYSICS_ADVANCED, "mTorso", "physics_advanced", "physics_advanced_param_list", "physics_advanced_tab", LLVector3d(0.f, 0.f, 0.f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH));
 }
 
 LLEditWearableDictionary::SubpartEntry::SubpartEntry(ESubpart part,
-					 const std::string &joint,
-					 const std::string &edit_group,
-					 const std::string &param_list,
-					 const std::string &accordion_tab,
-					 const LLVector3d  &target_offset,
-					 const LLVector3d  &camera_offset,
-					 const ESex 	   &sex) :
-	LLDictionaryEntry(edit_group),
-	mSubpart(part),
-	mTargetJoint(joint),
-	mEditGroup(edit_group),
-	mParamList(param_list),
-	mAccordionTab(accordion_tab),
-	mTargetOffset(target_offset),
-	mCameraOffset(camera_offset),
-	mSex(sex)
+                                         const std::string &joint,
+                                         const std::string &edit_group,
+                                         const std::string &param_list,
+                                         const std::string &accordion_tab,
+                                         const LLVector3d  &target_offset,
+                                         const LLVector3d  &camera_offset,
+                                         const ESex        &sex) :
+        LLDictionaryEntry(edit_group),
+        mSubpart(part),
+        mTargetJoint(joint),
+        mEditGroup(edit_group),
+        mParamList(param_list),
+        mAccordionTab(accordion_tab),
+        mTargetOffset(target_offset),
+        mCameraOffset(camera_offset),
+        mSex(sex)
 {
 }
 
 LLEditWearableDictionary::ColorSwatchCtrls::ColorSwatchCtrls()
 {
-	addEntry ( TEX_UPPER_SHIRT,  new PickerControlEntry (TEX_UPPER_SHIRT, "Color/Tint" ));
-	addEntry ( TEX_LOWER_PANTS,  new PickerControlEntry (TEX_LOWER_PANTS, "Color/Tint" ));
-	addEntry ( TEX_LOWER_SHOES,  new PickerControlEntry (TEX_LOWER_SHOES, "Color/Tint" ));
-	addEntry ( TEX_LOWER_SOCKS,  new PickerControlEntry (TEX_LOWER_SOCKS, "Color/Tint" ));
-	addEntry ( TEX_UPPER_JACKET, new PickerControlEntry (TEX_UPPER_JACKET, "Color/Tint" ));
-	addEntry ( TEX_SKIRT,  new PickerControlEntry (TEX_SKIRT, "Color/Tint" ));
-	addEntry ( TEX_UPPER_GLOVES, new PickerControlEntry (TEX_UPPER_GLOVES, "Color/Tint" ));
-	addEntry ( TEX_UPPER_UNDERSHIRT, new PickerControlEntry (TEX_UPPER_UNDERSHIRT, "Color/Tint" ));
-	addEntry ( TEX_LOWER_UNDERPANTS, new PickerControlEntry (TEX_LOWER_UNDERPANTS, "Color/Tint" ));
-	addEntry ( TEX_HEAD_TATTOO, new PickerControlEntry(TEX_HEAD_TATTOO, "Color/Tint" ));
+        addEntry ( TEX_UPPER_SHIRT,  new PickerControlEntry (TEX_UPPER_SHIRT, "Color/Tint" ));
+        addEntry ( TEX_LOWER_PANTS,  new PickerControlEntry (TEX_LOWER_PANTS, "Color/Tint" ));
+        addEntry ( TEX_LOWER_SHOES,  new PickerControlEntry (TEX_LOWER_SHOES, "Color/Tint" ));
+        addEntry ( TEX_LOWER_SOCKS,  new PickerControlEntry (TEX_LOWER_SOCKS, "Color/Tint" ));
+        addEntry ( TEX_UPPER_JACKET, new PickerControlEntry (TEX_UPPER_JACKET, "Color/Tint" ));
+        addEntry ( TEX_SKIRT,  new PickerControlEntry (TEX_SKIRT, "Color/Tint" ));
+        addEntry ( TEX_UPPER_GLOVES, new PickerControlEntry (TEX_UPPER_GLOVES, "Color/Tint" ));
+        addEntry ( TEX_UPPER_UNDERSHIRT, new PickerControlEntry (TEX_UPPER_UNDERSHIRT, "Color/Tint" ));
+        addEntry ( TEX_LOWER_UNDERPANTS, new PickerControlEntry (TEX_LOWER_UNDERPANTS, "Color/Tint" ));
+        addEntry ( TEX_HEAD_TATTOO, new PickerControlEntry(TEX_HEAD_TATTOO, "Color/Tint" ));
 }
 
 LLEditWearableDictionary::TextureCtrls::TextureCtrls()
 {
-	addEntry ( TEX_HEAD_BODYPAINT,  new PickerControlEntry (TEX_HEAD_BODYPAINT,  "Head Tattoos", LLUUID::null, TRUE ));
-	addEntry ( TEX_UPPER_BODYPAINT, new PickerControlEntry (TEX_UPPER_BODYPAINT, "Upper Tattoos", LLUUID::null, TRUE ));
-	addEntry ( TEX_LOWER_BODYPAINT, new PickerControlEntry (TEX_LOWER_BODYPAINT, "Lower Tattoos", LLUUID::null, TRUE ));
-	addEntry ( TEX_HAIR, new PickerControlEntry (TEX_HAIR, "Texture", LLUUID( gSavedSettings.getString( "UIImgDefaultHairUUID" ) ), FALSE ));
-	addEntry ( TEX_EYES_IRIS, new PickerControlEntry (TEX_EYES_IRIS, "Iris", LLUUID( gSavedSettings.getString( "UIImgDefaultEyesUUID" ) ), FALSE ));
-	addEntry ( TEX_UPPER_SHIRT, new PickerControlEntry (TEX_UPPER_SHIRT, "Fabric", LLUUID( gSavedSettings.getString( "UIImgDefaultShirtUUID" ) ), FALSE ));
-	addEntry ( TEX_LOWER_PANTS, new PickerControlEntry (TEX_LOWER_PANTS, "Fabric", LLUUID( gSavedSettings.getString( "UIImgDefaultPantsUUID" ) ), FALSE ));
-	addEntry ( TEX_LOWER_SHOES, new PickerControlEntry (TEX_LOWER_SHOES, "Fabric", LLUUID( gSavedSettings.getString( "UIImgDefaultShoesUUID" ) ), FALSE ));
-	addEntry ( TEX_LOWER_SOCKS, new PickerControlEntry (TEX_LOWER_SOCKS, "Fabric", LLUUID( gSavedSettings.getString( "UIImgDefaultSocksUUID" ) ), FALSE ));
-	addEntry ( TEX_UPPER_JACKET, new PickerControlEntry (TEX_UPPER_JACKET, "Upper Fabric", LLUUID( gSavedSettings.getString( "UIImgDefaultJacketUUID" ) ), FALSE ));
-	addEntry ( TEX_LOWER_JACKET, new PickerControlEntry (TEX_LOWER_JACKET, "Lower Fabric", LLUUID( gSavedSettings.getString( "UIImgDefaultJacketUUID" ) ), FALSE ));
-	addEntry ( TEX_SKIRT, new PickerControlEntry (TEX_SKIRT, "Fabric", LLUUID( gSavedSettings.getString( "UIImgDefaultSkirtUUID" ) ), FALSE ));
-	addEntry ( TEX_UPPER_GLOVES, new PickerControlEntry (TEX_UPPER_GLOVES, "Fabric", LLUUID( gSavedSettings.getString( "UIImgDefaultGlovesUUID" ) ), FALSE ));
-	addEntry ( TEX_UPPER_UNDERSHIRT, new PickerControlEntry (TEX_UPPER_UNDERSHIRT, "Fabric", LLUUID( gSavedSettings.getString( "UIImgDefaultUnderwearUUID" ) ), FALSE ));
-	addEntry ( TEX_LOWER_UNDERPANTS, new PickerControlEntry (TEX_LOWER_UNDERPANTS, "Fabric", LLUUID( gSavedSettings.getString( "UIImgDefaultUnderwearUUID" ) ), FALSE ));
-	addEntry ( TEX_LOWER_ALPHA, new PickerControlEntry (TEX_LOWER_ALPHA, "Lower Alpha", LLUUID( gSavedSettings.getString( "UIImgDefaultAlphaUUID" ) ), TRUE ));
-	addEntry ( TEX_UPPER_ALPHA, new PickerControlEntry (TEX_UPPER_ALPHA, "Upper Alpha", LLUUID( gSavedSettings.getString( "UIImgDefaultAlphaUUID" ) ), TRUE ));
-	addEntry ( TEX_HEAD_ALPHA, new PickerControlEntry (TEX_HEAD_ALPHA, "Head Alpha", LLUUID( gSavedSettings.getString( "UIImgDefaultAlphaUUID" ) ), TRUE ));
-	addEntry ( TEX_EYES_ALPHA, new PickerControlEntry (TEX_EYES_ALPHA, "Eye Alpha", LLUUID( gSavedSettings.getString( "UIImgDefaultAlphaUUID" ) ), TRUE ));
-	addEntry ( TEX_HAIR_ALPHA, new PickerControlEntry (TEX_HAIR_ALPHA, "Hair Alpha", LLUUID( gSavedSettings.getString( "UIImgDefaultAlphaUUID" ) ), TRUE ));
-	addEntry ( TEX_LOWER_TATTOO, new PickerControlEntry (TEX_LOWER_TATTOO, "Lower Tattoo", LLUUID::null, TRUE ));
-	addEntry ( TEX_UPPER_TATTOO, new PickerControlEntry (TEX_UPPER_TATTOO, "Upper Tattoo", LLUUID::null, TRUE ));
-	addEntry ( TEX_HEAD_TATTOO, new PickerControlEntry (TEX_HEAD_TATTOO, "Head Tattoo", LLUUID::null, TRUE ));
+        addEntry ( TEX_HEAD_BODYPAINT,  new PickerControlEntry (TEX_HEAD_BODYPAINT,  "Head Tattoos", LLUUID::null, TRUE ));
+        addEntry ( TEX_UPPER_BODYPAINT, new PickerControlEntry (TEX_UPPER_BODYPAINT, "Upper Tattoos", LLUUID::null, TRUE ));
+        addEntry ( TEX_LOWER_BODYPAINT, new PickerControlEntry (TEX_LOWER_BODYPAINT, "Lower Tattoos", LLUUID::null, TRUE ));
+        addEntry ( TEX_HAIR, new PickerControlEntry (TEX_HAIR, "Texture", LLUUID( gSavedSettings.getString( "UIImgDefaultHairUUID" ) ), FALSE ));
+        addEntry ( TEX_EYES_IRIS, new PickerControlEntry (TEX_EYES_IRIS, "Iris", LLUUID( gSavedSettings.getString( "UIImgDefaultEyesUUID" ) ), FALSE ));
+        addEntry ( TEX_UPPER_SHIRT, new PickerControlEntry (TEX_UPPER_SHIRT, "Fabric", LLUUID( gSavedSettings.getString( "UIImgDefaultShirtUUID" ) ), FALSE ));
+        addEntry ( TEX_LOWER_PANTS, new PickerControlEntry (TEX_LOWER_PANTS, "Fabric", LLUUID( gSavedSettings.getString( "UIImgDefaultPantsUUID" ) ), FALSE ));
+        addEntry ( TEX_LOWER_SHOES, new PickerControlEntry (TEX_LOWER_SHOES, "Fabric", LLUUID( gSavedSettings.getString( "UIImgDefaultShoesUUID" ) ), FALSE ));
+        addEntry ( TEX_LOWER_SOCKS, new PickerControlEntry (TEX_LOWER_SOCKS, "Fabric", LLUUID( gSavedSettings.getString( "UIImgDefaultSocksUUID" ) ), FALSE ));
+        addEntry ( TEX_UPPER_JACKET, new PickerControlEntry (TEX_UPPER_JACKET, "Upper Fabric", LLUUID( gSavedSettings.getString( "UIImgDefaultJacketUUID" ) ), FALSE ));
+        addEntry ( TEX_LOWER_JACKET, new PickerControlEntry (TEX_LOWER_JACKET, "Lower Fabric", LLUUID( gSavedSettings.getString( "UIImgDefaultJacketUUID" ) ), FALSE ));
+        addEntry ( TEX_SKIRT, new PickerControlEntry (TEX_SKIRT, "Fabric", LLUUID( gSavedSettings.getString( "UIImgDefaultSkirtUUID" ) ), FALSE ));
+        addEntry ( TEX_UPPER_GLOVES, new PickerControlEntry (TEX_UPPER_GLOVES, "Fabric", LLUUID( gSavedSettings.getString( "UIImgDefaultGlovesUUID" ) ), FALSE ));
+        addEntry ( TEX_UPPER_UNDERSHIRT, new PickerControlEntry (TEX_UPPER_UNDERSHIRT, "Fabric", LLUUID( gSavedSettings.getString( "UIImgDefaultUnderwearUUID" ) ), FALSE ));
+        addEntry ( TEX_LOWER_UNDERPANTS, new PickerControlEntry (TEX_LOWER_UNDERPANTS, "Fabric", LLUUID( gSavedSettings.getString( "UIImgDefaultUnderwearUUID" ) ), FALSE ));
+        addEntry ( TEX_LOWER_ALPHA, new PickerControlEntry (TEX_LOWER_ALPHA, "Lower Alpha", LLUUID( gSavedSettings.getString( "UIImgDefaultAlphaUUID" ) ), TRUE ));
+        addEntry ( TEX_UPPER_ALPHA, new PickerControlEntry (TEX_UPPER_ALPHA, "Upper Alpha", LLUUID( gSavedSettings.getString( "UIImgDefaultAlphaUUID" ) ), TRUE ));
+        addEntry ( TEX_HEAD_ALPHA, new PickerControlEntry (TEX_HEAD_ALPHA, "Head Alpha", LLUUID( gSavedSettings.getString( "UIImgDefaultAlphaUUID" ) ), TRUE ));
+        addEntry ( TEX_EYES_ALPHA, new PickerControlEntry (TEX_EYES_ALPHA, "Eye Alpha", LLUUID( gSavedSettings.getString( "UIImgDefaultAlphaUUID" ) ), TRUE ));
+        addEntry ( TEX_HAIR_ALPHA, new PickerControlEntry (TEX_HAIR_ALPHA, "Hair Alpha", LLUUID( gSavedSettings.getString( "UIImgDefaultAlphaUUID" ) ), TRUE ));
+        addEntry ( TEX_LOWER_TATTOO, new PickerControlEntry (TEX_LOWER_TATTOO, "Lower Tattoo", LLUUID::null, TRUE ));
+        addEntry ( TEX_UPPER_TATTOO, new PickerControlEntry (TEX_UPPER_TATTOO, "Upper Tattoo", LLUUID::null, TRUE ));
+        addEntry ( TEX_HEAD_TATTOO, new PickerControlEntry (TEX_HEAD_TATTOO, "Head Tattoo", LLUUID::null, TRUE ));
 }
 
 LLEditWearableDictionary::PickerControlEntry::PickerControlEntry(ETextureIndex tex_index,
-					 const std::string name,
-					 const LLUUID default_image_id,
-					 const bool allow_no_texture) :
-	LLDictionaryEntry(name),
-	mTextureIndex(tex_index),
-	mControlName(name),
-	mDefaultImageId(default_image_id),
-	mAllowNoTexture(allow_no_texture)
+                                         const std::string name,
+                                         const LLUUID default_image_id,
+                                         const bool allow_no_texture) :
+        LLDictionaryEntry(name),
+        mTextureIndex(tex_index),
+        mControlName(name),
+        mDefaultImageId(default_image_id),
+        mAllowNoTexture(allow_no_texture)
 {
 }
 
@@ -397,13 +397,13 @@ LLEditWearableDictionary::PickerControlEntry::PickerControlEntry(ETextureIndex t
 class LLLabledBackButton : public LLButton
 {
 public:
-	struct Params : public LLInitParam::Block<Params, LLButton::Params>
-	{
-		Params() {}
-	};
+        struct Params : public LLInitParam::Block<Params, LLButton::Params>
+        {
+                Params() {}
+        };
 protected:
-	friend class LLUICtrlFactory;
-	LLLabledBackButton(const Params&);
+        friend class LLUICtrlFactory;
+        LLLabledBackButton(const Params&);
 };
 
 static LLDefaultChildRegistry::Register<LLLabledBackButton> labeled_back_btn("labeled_back_button");
@@ -411,9 +411,9 @@ static LLDefaultChildRegistry::Register<LLLabledBackButton> labeled_back_btn("la
 LLLabledBackButton::LLLabledBackButton(const Params& params)
 : LLButton(params)
 {
-	// override hack in LLButton's constructor to use paddings have been set in xml
-	setLeftHPad(params.pad_left);
-	setRightHPad(params.pad_right);
+        // override hack in LLButton's constructor to use paddings have been set in xml
+        setLeftHPad(params.pad_left);
+        setRightHPad(params.pad_right);
 }
 
 // Helper functions.
@@ -434,13 +434,13 @@ typedef boost::function<void(LLPanel* panel, const LLEditWearableDictionary::Pic
 
 typedef struct PickerControlEntryNamePredicate
 {
-	PickerControlEntryNamePredicate(const std::string name) : mName (name) {};
-	bool operator()(const LLEditWearableDictionary::PickerControlEntry* entry) const
-	{
-		return (entry && entry->mName == mName);
-	}
+        PickerControlEntryNamePredicate(const std::string name) : mName (name) {};
+        bool operator()(const LLEditWearableDictionary::PickerControlEntry* entry) const
+        {
+                return (entry && entry->mName == mName);
+        }
 private:
-	const std::string mName;
+        const std::string mName;
 } PickerControlEntryNamePredicate;
 
 // A full specialization of get_pickers_indexes for LLColorSwatchCtrl
@@ -448,12 +448,12 @@ template <>
 const texture_vec_t&
 get_pickers_indexes<LLColorSwatchCtrl> (const LLEditWearableDictionary::WearableEntry *wearable_entry)
 {
-	if (!wearable_entry)
-	{
-		llwarns << "could not get LLColorSwatchCtrl indexes for null wearable entry." << llendl;
-		return null_texture_vec;
-	}
-	return wearable_entry->mColorSwatchCtrls;
+        if (!wearable_entry)
+        {
+                llwarns << "could not get LLColorSwatchCtrl indexes for null wearable entry." << llendl;
+                return null_texture_vec;
+        }
+        return wearable_entry->mColorSwatchCtrls;
 }
 
 // A full specialization of get_pickers_indexes for LLTextureCtrl
@@ -461,12 +461,12 @@ template <>
 const texture_vec_t&
 get_pickers_indexes<LLTextureCtrl> (const LLEditWearableDictionary::WearableEntry *wearable_entry)
 {
-	if (!wearable_entry)
-	{
-		llwarns << "could not get LLTextureCtrl indexes for null wearable entry." << llendl;
-		return null_texture_vec;
-	}
-	return wearable_entry->mTextureCtrls;
+        if (!wearable_entry)
+        {
+                llwarns << "could not get LLTextureCtrl indexes for null wearable entry." << llendl;
+                return null_texture_vec;
+        }
+        return wearable_entry->mTextureCtrls;
 }
 
 // A full specialization of get_picker_entry for LLColorSwatchCtrl
@@ -474,7 +474,7 @@ template <>
 const LLEditWearableDictionary::PickerControlEntry*
 get_picker_entry<LLColorSwatchCtrl> (const ETextureIndex index)
 {
-	return LLEditWearableDictionary::getInstance()->getColorSwatch(index);
+        return LLEditWearableDictionary::getInstance()->getColorSwatch(index);
 }
 
 // A full specialization of get_picker_entry for LLTextureCtrl
@@ -482,162 +482,162 @@ template <>
 const LLEditWearableDictionary::PickerControlEntry*
 get_picker_entry<LLTextureCtrl> (const ETextureIndex index)
 {
-	return LLEditWearableDictionary::getInstance()->getTexturePicker(index);
+        return LLEditWearableDictionary::getInstance()->getTexturePicker(index);
 }
 
 template <typename CtrlType, class Predicate>
 const LLEditWearableDictionary::PickerControlEntry*
 find_picker_ctrl_entry_if(LLWearableType::EType type, const Predicate pred)
 {
-	const LLEditWearableDictionary::WearableEntry *wearable_entry
-		= LLEditWearableDictionary::getInstance()->getWearable(type);
-	if (!wearable_entry)
-	{
-		llwarns << "could not get wearable dictionary entry for wearable of type: " << type << llendl;
-		return NULL;
-	}
-	const texture_vec_t& indexes = get_pickers_indexes<CtrlType>(wearable_entry);
-	for (texture_vec_t::const_iterator
-			 iter = indexes.begin(),
-			 iter_end = indexes.end();
-		 iter != iter_end; ++iter)
-	{
-		const ETextureIndex te = *iter;
-		const LLEditWearableDictionary::PickerControlEntry*	entry
-			= get_picker_entry<CtrlType>(te);
-		if (!entry)
-		{
-			llwarns << "could not get picker dictionary entry (" << te << ") for wearable of type: " << type << llendl;
-			continue;
-		}
-		if (pred(entry))
-		{
-			return entry;
-		}
-	}
-	return NULL;
+        const LLEditWearableDictionary::WearableEntry *wearable_entry
+                = LLEditWearableDictionary::getInstance()->getWearable(type);
+        if (!wearable_entry)
+        {
+                llwarns << "could not get wearable dictionary entry for wearable of type: " << type << llendl;
+                return NULL;
+        }
+        const texture_vec_t& indexes = get_pickers_indexes<CtrlType>(wearable_entry);
+        for (texture_vec_t::const_iterator
+                         iter = indexes.begin(),
+                         iter_end = indexes.end();
+                 iter != iter_end; ++iter)
+        {
+                const ETextureIndex te = *iter;
+                const LLEditWearableDictionary::PickerControlEntry*     entry
+                        = get_picker_entry<CtrlType>(te);
+                if (!entry)
+                {
+                        llwarns << "could not get picker dictionary entry (" << te << ") for wearable of type: " << type << llendl;
+                        continue;
+                }
+                if (pred(entry))
+                {
+                        return entry;
+                }
+        }
+        return NULL;
 }
 
 template <typename CtrlType>
 void
 for_each_picker_ctrl_entry(LLPanel* panel, LLWearableType::EType type, function_t fun)
 {
-	if (!panel)
-	{
-		llwarns << "the panel wasn't passed for wearable of type: " << type << llendl;
-		return;
-	}
-	const LLEditWearableDictionary::WearableEntry *wearable_entry
-		= LLEditWearableDictionary::getInstance()->getWearable(type);
-	if (!wearable_entry)
-	{
-		llwarns << "could not get wearable dictionary entry for wearable of type: " << type << llendl;
-		return;
-	}
-	const texture_vec_t& indexes = get_pickers_indexes<CtrlType>(wearable_entry);
-	for (texture_vec_t::const_iterator
-			 iter = indexes.begin(),
-			 iter_end = indexes.end();
-		 iter != iter_end; ++iter)
-	{
-		const ETextureIndex te = *iter;
-		const LLEditWearableDictionary::PickerControlEntry*	entry
-			= get_picker_entry<CtrlType>(te);
-		if (!entry)
-		{
-			llwarns << "could not get picker dictionary entry (" << te << ") for wearable of type: " << type << llendl;
-			continue;
-		}
-		fun (panel, entry);
-	}
+        if (!panel)
+        {
+                llwarns << "the panel wasn't passed for wearable of type: " << type << llendl;
+                return;
+        }
+        const LLEditWearableDictionary::WearableEntry *wearable_entry
+                = LLEditWearableDictionary::getInstance()->getWearable(type);
+        if (!wearable_entry)
+        {
+                llwarns << "could not get wearable dictionary entry for wearable of type: " << type << llendl;
+                return;
+        }
+        const texture_vec_t& indexes = get_pickers_indexes<CtrlType>(wearable_entry);
+        for (texture_vec_t::const_iterator
+                         iter = indexes.begin(),
+                         iter_end = indexes.end();
+                 iter != iter_end; ++iter)
+        {
+                const ETextureIndex te = *iter;
+                const LLEditWearableDictionary::PickerControlEntry*     entry
+                        = get_picker_entry<CtrlType>(te);
+                if (!entry)
+                {
+                        llwarns << "could not get picker dictionary entry (" << te << ") for wearable of type: " << type << llendl;
+                        continue;
+                }
+                fun (panel, entry);
+        }
 }
 
 // The helper functions for pickers management
 static void init_color_swatch_ctrl(LLPanelEditWearable* self, LLPanel* panel, const LLEditWearableDictionary::PickerControlEntry* entry)
 {
-	LLColorSwatchCtrl* color_swatch_ctrl = panel->getChild<LLColorSwatchCtrl>(entry->mControlName);
-	if (color_swatch_ctrl)
-	{
-		// Can't get the color from the wearable here, since the wearable may not be set when this is called.
-		color_swatch_ctrl->setOriginal(LLColor4::white);
-	}
+        LLColorSwatchCtrl* color_swatch_ctrl = panel->getChild<LLColorSwatchCtrl>(entry->mControlName);
+        if (color_swatch_ctrl)
+        {
+                // Can't get the color from the wearable here, since the wearable may not be set when this is called.
+                color_swatch_ctrl->setOriginal(LLColor4::white);
+        }
 }
 
 static void init_texture_ctrl(LLPanelEditWearable* self, LLPanel* panel, const LLEditWearableDictionary::PickerControlEntry* entry)
 {
-	LLTextureCtrl* texture_ctrl = panel->getChild<LLTextureCtrl>(entry->mControlName);
-	if (texture_ctrl)
-	{
-		texture_ctrl->setDefaultImageAssetID(entry->mDefaultImageId);
-		texture_ctrl->setAllowNoTexture(entry->mAllowNoTexture);
-		// Don't allow (no copy) or (notransfer) textures to be selected.
-		texture_ctrl->setImmediateFilterPermMask(PERM_NONE);
-		texture_ctrl->setNonImmediateFilterPermMask(PERM_NONE);
-	}
+        LLTextureCtrl* texture_ctrl = panel->getChild<LLTextureCtrl>(entry->mControlName);
+        if (texture_ctrl)
+        {
+                texture_ctrl->setDefaultImageAssetID(entry->mDefaultImageId);
+                texture_ctrl->setAllowNoTexture(entry->mAllowNoTexture);
+                // Don't allow (no copy) or (notransfer) textures to be selected.
+                texture_ctrl->setImmediateFilterPermMask(PERM_NONE);
+                texture_ctrl->setNonImmediateFilterPermMask(PERM_NONE);
+        }
 }
 
 static void update_color_swatch_ctrl(LLPanelEditWearable* self, LLPanel* panel, const LLEditWearableDictionary::PickerControlEntry* entry)
 {
-	LLColorSwatchCtrl* color_swatch_ctrl = panel->getChild<LLColorSwatchCtrl>(entry->mControlName);
-	if (color_swatch_ctrl)
-	{
-		color_swatch_ctrl->set(self->getWearable()->getClothesColor(entry->mTextureIndex));
-		color_swatch_ctrl->closeFloaterColorPicker();
-	}
+        LLColorSwatchCtrl* color_swatch_ctrl = panel->getChild<LLColorSwatchCtrl>(entry->mControlName);
+        if (color_swatch_ctrl)
+        {
+                color_swatch_ctrl->set(self->getWearable()->getClothesColor(entry->mTextureIndex));
+                color_swatch_ctrl->closeFloaterColorPicker();
+        }
 }
 
 static void update_texture_ctrl(LLPanelEditWearable* self, LLPanel* panel, const LLEditWearableDictionary::PickerControlEntry* entry)
 {
-	LLTextureCtrl* texture_ctrl = panel->getChild<LLTextureCtrl>(entry->mControlName);
-	if (texture_ctrl)
-	{
-		LLUUID new_id;
-		LLLocalTextureObject *lto = self->getWearable()->getLocalTextureObject(entry->mTextureIndex);
-		if( lto && (lto->getID() != IMG_DEFAULT_AVATAR) )
-		{
-			new_id = lto->getID();
-		}
-		else
-		{
-			new_id = LLUUID::null;
-		}
-		LLUUID old_id = texture_ctrl->getImageAssetID();
-		if (old_id != new_id)
-		{
-			// texture has changed, close the floater to avoid DEV-22461
-			texture_ctrl->closeDependentFloater();
-		}
-		texture_ctrl->setImageAssetID(new_id);
-	}
+        LLTextureCtrl* texture_ctrl = panel->getChild<LLTextureCtrl>(entry->mControlName);
+        if (texture_ctrl)
+        {
+                LLUUID new_id;
+                LLLocalTextureObject *lto = self->getWearable()->getLocalTextureObject(entry->mTextureIndex);
+                if( lto && (lto->getID() != IMG_DEFAULT_AVATAR) )
+                {
+                        new_id = lto->getID();
+                }
+                else
+                {
+                        new_id = LLUUID::null;
+                }
+                LLUUID old_id = texture_ctrl->getImageAssetID();
+                if (old_id != new_id)
+                {
+                        // texture has changed, close the floater to avoid DEV-22461
+                        texture_ctrl->closeDependentFloater();
+                }
+                texture_ctrl->setImageAssetID(new_id);
+        }
 }
 
 static void set_enabled_color_swatch_ctrl(bool enabled, LLPanel* panel, const LLEditWearableDictionary::PickerControlEntry* entry)
 {
-	LLColorSwatchCtrl* color_swatch_ctrl = panel->getChild<LLColorSwatchCtrl>(entry->mControlName);
-	if (color_swatch_ctrl)
-	{
-		color_swatch_ctrl->setEnabled(enabled);
-	}
+        LLColorSwatchCtrl* color_swatch_ctrl = panel->getChild<LLColorSwatchCtrl>(entry->mControlName);
+        if (color_swatch_ctrl)
+        {
+                color_swatch_ctrl->setEnabled(enabled);
+        }
 }
 
 static void set_enabled_texture_ctrl(bool enabled, LLPanel* panel, const LLEditWearableDictionary::PickerControlEntry* entry)
 {
-	LLTextureCtrl* texture_ctrl = panel->getChild<LLTextureCtrl>(entry->mControlName);
-	if (texture_ctrl)
-	{
-		texture_ctrl->setEnabled(enabled);
-	}
+        LLTextureCtrl* texture_ctrl = panel->getChild<LLTextureCtrl>(entry->mControlName);
+        if (texture_ctrl)
+        {
+                texture_ctrl->setEnabled(enabled);
+        }
 }
 
 // LLPanelEditWearable
 
 LLPanelEditWearable::LLPanelEditWearable()
-	: LLPanel()
-	, mWearablePtr(NULL)
-	, mWearableItem(NULL)
+        : LLPanel()
+        , mWearablePtr(NULL)
+        , mWearableItem(NULL)
 {
-	mCommitCallbackRegistrar.add("ColorSwatch.Commit", boost::bind(&LLPanelEditWearable::onColorSwatchCommit, this, _1));
-	mCommitCallbackRegistrar.add("TexturePicker.Commit", boost::bind(&LLPanelEditWearable::onTexturePickerCommit, this, _1));
+        mCommitCallbackRegistrar.add("ColorSwatch.Commit", boost::bind(&LLPanelEditWearable::onColorSwatchCommit, this, _1));
+        mCommitCallbackRegistrar.add("TexturePicker.Commit", boost::bind(&LLPanelEditWearable::onTexturePickerCommit, this, _1));
 }
 
 //virtual
@@ -648,935 +648,935 @@ LLPanelEditWearable::~LLPanelEditWearable()
 
 bool LLPanelEditWearable::changeHeightUnits(const LLSD& new_value)
 {
-	updateMetricLayout( new_value.asBoolean() );
-	updateTypeSpecificControls(LLWearableType::WT_SHAPE);
-	return true;
+        updateMetricLayout( new_value.asBoolean() );
+        updateTypeSpecificControls(LLWearableType::WT_SHAPE);
+        return true;
 }
 
 void LLPanelEditWearable::updateMetricLayout(BOOL new_value)
 {
-	LLUIString current_metric, replacment_metric;
-	current_metric = new_value ? mMeters : mFeet;
-	replacment_metric = new_value ? mFeet : mMeters;
-	mHeigthValue.setArg( "[METRIC1]", current_metric.getString() );
-	mReplacementMetricUrl.setArg( "[URL_METRIC2]", std::string("[secondlife:///app/metricsystem ") + replacment_metric.getString() + std::string("]"));
+        LLUIString current_metric, replacment_metric;
+        current_metric = new_value ? mMeters : mFeet;
+        replacment_metric = new_value ? mFeet : mMeters;
+        mHeigthValue.setArg( "[METRIC1]", current_metric.getString() );
+        mReplacementMetricUrl.setArg( "[URL_METRIC2]", std::string("[secondlife:///app/metricsystem ") + replacment_metric.getString() + std::string("]"));
 }
 
 void LLPanelEditWearable::updateAvatarHeightLabel()
 {
-	mTxtAvatarHeight->setText(LLStringUtil::null);
-	LLStyle::Params param;
-	param.color = mAvatarHeigthLabelColor;
-	mTxtAvatarHeight->appendText(mHeigth, false, param);
-	param.color = mAvatarHeigthValueLabelColor;
-	mTxtAvatarHeight->appendText(mHeigthValue, false, param);
-	param.color = mAvatarHeigthLabelColor; // using mAvatarHeigthLabelColor for '/' separator
-	mTxtAvatarHeight->appendText(" / ", false, param);
-	mTxtAvatarHeight->appendText(this->mReplacementMetricUrl, false, param);
+        mTxtAvatarHeight->setText(LLStringUtil::null);
+        LLStyle::Params param;
+        param.color = mAvatarHeigthLabelColor;
+        mTxtAvatarHeight->appendText(mHeigth, false, param);
+        param.color = mAvatarHeigthValueLabelColor;
+        mTxtAvatarHeight->appendText(mHeigthValue, false, param);
+        param.color = mAvatarHeigthLabelColor; // using mAvatarHeigthLabelColor for '/' separator
+        mTxtAvatarHeight->appendText(" / ", false, param);
+        mTxtAvatarHeight->appendText(this->mReplacementMetricUrl, false, param);
 }
 
 void LLPanelEditWearable::onWearablePanelVisibilityChange(const LLSD &in_visible_chain, LLAccordionCtrl* accordion_ctrl)
 {
-	if (in_visible_chain.asBoolean() && accordion_ctrl != NULL)
-	{
-		accordion_ctrl->expandDefaultTab();
-	}
+        if (in_visible_chain.asBoolean() && accordion_ctrl != NULL)
+        {
+                accordion_ctrl->expandDefaultTab();
+        }
 }
 
 void LLPanelEditWearable::setWearablePanelVisibilityChangeCallback(LLPanel* bodypart_panel)
 {
-	if (bodypart_panel != NULL)
-	{
-		LLAccordionCtrl* accordion_ctrl = bodypart_panel->getChild<LLAccordionCtrl>("wearable_accordion");
-
-		if (accordion_ctrl != NULL)
-		{
-			bodypart_panel->setVisibleCallback(
-					boost::bind(&LLPanelEditWearable::onWearablePanelVisibilityChange, this, _2, accordion_ctrl));
-		}
-		else
-		{
-			llwarns << "accordion_ctrl is NULL" << llendl;
-		}
-	}
-	else
-	{
-		llwarns << "bodypart_panel is NULL" << llendl;
-	}
+        if (bodypart_panel != NULL)
+        {
+                LLAccordionCtrl* accordion_ctrl = bodypart_panel->getChild<LLAccordionCtrl>("wearable_accordion");
+
+                if (accordion_ctrl != NULL)
+                {
+                        bodypart_panel->setVisibleCallback(
+                                        boost::bind(&LLPanelEditWearable::onWearablePanelVisibilityChange, this, _2, accordion_ctrl));
+                }
+                else
+                {
+                        llwarns << "accordion_ctrl is NULL" << llendl;
+                }
+        }
+        else
+        {
+                llwarns << "bodypart_panel is NULL" << llendl;
+        }
 }
 
 // virtual 
 BOOL LLPanelEditWearable::postBuild()
 {
-	// buttons
-	mBtnRevert = getChild<LLButton>("revert_button");
-	mBtnRevert->setClickedCallback(boost::bind(&LLPanelEditWearable::onRevertButtonClicked, this));
-
-	mBtnBack = getChild<LLButton>("back_btn");
-	mBackBtnLabel = mBtnBack->getLabelUnselected();
-	mBtnBack->setLabel(LLStringUtil::null);
-	// handled at appearance panel level?
-	//mBtnBack->setClickedCallback(boost::bind(&LLPanelEditWearable::onBackButtonClicked, this));
-
-	mNameEditor = getChild<LLLineEditor>("description");
-
-	mPanelTitle = getChild<LLTextBox>("edit_wearable_title");
-	mDescTitle = getChild<LLTextBox>("description_text");
-
-	getChild<LLRadioGroup>("sex_radio")->setCommitCallback(boost::bind(&LLPanelEditWearable::onCommitSexChange, this));
-	getChild<LLButton>("save_as_button")->setCommitCallback(boost::bind(&LLPanelEditWearable::onSaveAsButtonClicked, this));
-
-	// The following panels will be shown/hidden based on what wearable we're editing
-	// body parts
-	mPanelShape = getChild<LLPanel>("edit_shape_panel");
-	mPanelSkin = getChild<LLPanel>("edit_skin_panel");
-	mPanelEyes = getChild<LLPanel>("edit_eyes_panel");
-	mPanelHair = getChild<LLPanel>("edit_hair_panel");
-
-	// Setting the visibility callback is applied only to the bodyparts panel
-	// because currently they are the only ones whose 'wearable_accordion' has
-	// multiple accordion tabs (see EXT-8164 for details).
-	setWearablePanelVisibilityChangeCallback(mPanelShape);
-	setWearablePanelVisibilityChangeCallback(mPanelSkin);
-	setWearablePanelVisibilityChangeCallback(mPanelEyes);
-	setWearablePanelVisibilityChangeCallback(mPanelHair);
-
-	//clothes
-	mPanelShirt = getChild<LLPanel>("edit_shirt_panel");
-	mPanelPants = getChild<LLPanel>("edit_pants_panel");
-	mPanelShoes = getChild<LLPanel>("edit_shoes_panel");
-	mPanelSocks = getChild<LLPanel>("edit_socks_panel");
-	mPanelJacket = getChild<LLPanel>("edit_jacket_panel");
-	mPanelGloves = getChild<LLPanel>("edit_gloves_panel");
-	mPanelUndershirt = getChild<LLPanel>("edit_undershirt_panel");
-	mPanelUnderpants = getChild<LLPanel>("edit_underpants_panel");
-	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");
-
-	mWearablePtr = NULL;
-
-	configureAlphaCheckbox(LLVOAvatarDefines::TEX_LOWER_ALPHA, "lower alpha texture invisible");
-	configureAlphaCheckbox(LLVOAvatarDefines::TEX_UPPER_ALPHA, "upper alpha texture invisible");
-	configureAlphaCheckbox(LLVOAvatarDefines::TEX_HEAD_ALPHA, "head alpha texture invisible");
-	configureAlphaCheckbox(LLVOAvatarDefines::TEX_EYES_ALPHA, "eye alpha texture invisible");
-	configureAlphaCheckbox(LLVOAvatarDefines::TEX_HAIR_ALPHA, "hair alpha texture invisible");
-
-	// configure tab expanded callbacks
-	for (U32 type_index = 0; type_index < (U32)LLWearableType::WT_COUNT; ++type_index)
-	{
-		LLWearableType::EType type = (LLWearableType::EType) type_index;
-		const LLEditWearableDictionary::WearableEntry *wearable_entry = LLEditWearableDictionary::getInstance()->getWearable(type);
-		if (!wearable_entry)
-		{
-			llwarns << "could not get wearable dictionary entry for wearable of type: " << type << llendl;
-			continue;
-		}
-		U8 num_subparts = wearable_entry->mSubparts.size();
-	
-		for (U8 index = 0; index < num_subparts; ++index)
-		{
-			// dive into data structures to get the panel we need
-			ESubpart subpart_e = wearable_entry->mSubparts[index];
-			const LLEditWearableDictionary::SubpartEntry *subpart_entry = LLEditWearableDictionary::getInstance()->getSubpart(subpart_e);
-	
-			if (!subpart_entry)
-			{
-				llwarns << "could not get wearable subpart dictionary entry for subpart: " << subpart_e << llendl;
-				continue;
-			}
-	
-			const std::string accordion_tab = subpart_entry->mAccordionTab;
-	
-			LLAccordionCtrlTab *tab = getChild<LLAccordionCtrlTab>(accordion_tab);
-	
-			if (!tab)
-			{
-				llwarns << "could not get llaccordionctrltab from UI with name: " << accordion_tab << llendl;
-				continue;
-			}
-	
-			// initialize callback to ensure camera view changes appropriately.
-			tab->setDropDownStateChangedCallback(boost::bind(&LLPanelEditWearable::onTabExpandedCollapsed,this,_2,index));
-		}
-
-		// initialize texture and color picker controls
-		for_each_picker_ctrl_entry <LLColorSwatchCtrl> (getPanel(type), type, boost::bind(init_color_swatch_ctrl, this, _1, _2));
-		for_each_picker_ctrl_entry <LLTextureCtrl>     (getPanel(type), type, boost::bind(init_texture_ctrl, this, _1, _2));
-	}
-
-	// init all strings
-	mMeters		= mPanelShape->getString("meters");
-	mFeet		= mPanelShape->getString("feet");
-	mHeigth		= mPanelShape->getString("height") + " ";
-	mHeigthValue	= "[HEIGHT] [METRIC1]";
-	mReplacementMetricUrl	= "[URL_METRIC2]";
-
-	std::string color = mPanelShape->getString("heigth_label_color");
-	mAvatarHeigthLabelColor = LLUIColorTable::instance().getColor(color, LLColor4::green);
-	color = mPanelShape->getString("heigth_value_label_color");
-	mAvatarHeigthValueLabelColor = LLUIColorTable::instance().getColor(color, LLColor4::green);
-	gSavedSettings.getControl("HeightUnits")->getSignal()->connect(boost::bind(&LLPanelEditWearable::changeHeightUnits, this, _2));
-	updateMetricLayout(gSavedSettings.getBOOL("HeightUnits"));
-
-	return TRUE;
+        // buttons
+        mBtnRevert = getChild<LLButton>("revert_button");
+        mBtnRevert->setClickedCallback(boost::bind(&LLPanelEditWearable::onRevertButtonClicked, this));
+
+        mBtnBack = getChild<LLButton>("back_btn");
+        mBackBtnLabel = mBtnBack->getLabelUnselected();
+        mBtnBack->setLabel(LLStringUtil::null);
+        // handled at appearance panel level?
+        //mBtnBack->setClickedCallback(boost::bind(&LLPanelEditWearable::onBackButtonClicked, this));
+
+        mNameEditor = getChild<LLLineEditor>("description");
+
+        mPanelTitle = getChild<LLTextBox>("edit_wearable_title");
+        mDescTitle = getChild<LLTextBox>("description_text");
+
+        getChild<LLRadioGroup>("sex_radio")->setCommitCallback(boost::bind(&LLPanelEditWearable::onCommitSexChange, this));
+        getChild<LLButton>("save_as_button")->setCommitCallback(boost::bind(&LLPanelEditWearable::onSaveAsButtonClicked, this));
+
+        // The following panels will be shown/hidden based on what wearable we're editing
+        // body parts
+        mPanelShape = getChild<LLPanel>("edit_shape_panel");
+        mPanelSkin = getChild<LLPanel>("edit_skin_panel");
+        mPanelEyes = getChild<LLPanel>("edit_eyes_panel");
+        mPanelHair = getChild<LLPanel>("edit_hair_panel");
+
+        // Setting the visibility callback is applied only to the bodyparts panel
+        // because currently they are the only ones whose 'wearable_accordion' has
+        // multiple accordion tabs (see EXT-8164 for details).
+        setWearablePanelVisibilityChangeCallback(mPanelShape);
+        setWearablePanelVisibilityChangeCallback(mPanelSkin);
+        setWearablePanelVisibilityChangeCallback(mPanelEyes);
+        setWearablePanelVisibilityChangeCallback(mPanelHair);
+
+        //clothes
+        mPanelShirt = getChild<LLPanel>("edit_shirt_panel");
+        mPanelPants = getChild<LLPanel>("edit_pants_panel");
+        mPanelShoes = getChild<LLPanel>("edit_shoes_panel");
+        mPanelSocks = getChild<LLPanel>("edit_socks_panel");
+        mPanelJacket = getChild<LLPanel>("edit_jacket_panel");
+        mPanelGloves = getChild<LLPanel>("edit_gloves_panel");
+        mPanelUndershirt = getChild<LLPanel>("edit_undershirt_panel");
+        mPanelUnderpants = getChild<LLPanel>("edit_underpants_panel");
+        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");
+
+        mWearablePtr = NULL;
+
+        configureAlphaCheckbox(LLVOAvatarDefines::TEX_LOWER_ALPHA, "lower alpha texture invisible");
+        configureAlphaCheckbox(LLVOAvatarDefines::TEX_UPPER_ALPHA, "upper alpha texture invisible");
+        configureAlphaCheckbox(LLVOAvatarDefines::TEX_HEAD_ALPHA, "head alpha texture invisible");
+        configureAlphaCheckbox(LLVOAvatarDefines::TEX_EYES_ALPHA, "eye alpha texture invisible");
+        configureAlphaCheckbox(LLVOAvatarDefines::TEX_HAIR_ALPHA, "hair alpha texture invisible");
+
+        // configure tab expanded callbacks
+        for (U32 type_index = 0; type_index < (U32)LLWearableType::WT_COUNT; ++type_index)
+        {
+                LLWearableType::EType type = (LLWearableType::EType) type_index;
+                const LLEditWearableDictionary::WearableEntry *wearable_entry = LLEditWearableDictionary::getInstance()->getWearable(type);
+                if (!wearable_entry)
+                {
+                        llwarns << "could not get wearable dictionary entry for wearable of type: " << type << llendl;
+                        continue;
+                }
+                U8 num_subparts = wearable_entry->mSubparts.size();
+        
+                for (U8 index = 0; index < num_subparts; ++index)
+                {
+                        // dive into data structures to get the panel we need
+                        ESubpart subpart_e = wearable_entry->mSubparts[index];
+                        const LLEditWearableDictionary::SubpartEntry *subpart_entry = LLEditWearableDictionary::getInstance()->getSubpart(subpart_e);
+        
+                        if (!subpart_entry)
+                        {
+                                llwarns << "could not get wearable subpart dictionary entry for subpart: " << subpart_e << llendl;
+                                continue;
+                        }
+        
+                        const std::string accordion_tab = subpart_entry->mAccordionTab;
+        
+                        LLAccordionCtrlTab *tab = getChild<LLAccordionCtrlTab>(accordion_tab);
+        
+                        if (!tab)
+                        {
+                                llwarns << "could not get llaccordionctrltab from UI with name: " << accordion_tab << llendl;
+                                continue;
+                        }
+        
+                        // initialize callback to ensure camera view changes appropriately.
+                        tab->setDropDownStateChangedCallback(boost::bind(&LLPanelEditWearable::onTabExpandedCollapsed,this,_2,index));
+                }
+
+                // initialize texture and color picker controls
+                for_each_picker_ctrl_entry <LLColorSwatchCtrl> (getPanel(type), type, boost::bind(init_color_swatch_ctrl, this, _1, _2));
+                for_each_picker_ctrl_entry <LLTextureCtrl>     (getPanel(type), type, boost::bind(init_texture_ctrl, this, _1, _2));
+        }
+
+        // init all strings
+        mMeters         = mPanelShape->getString("meters");
+        mFeet           = mPanelShape->getString("feet");
+        mHeigth         = mPanelShape->getString("height") + " ";
+        mHeigthValue    = "[HEIGHT] [METRIC1]";
+        mReplacementMetricUrl   = "[URL_METRIC2]";
+
+        std::string color = mPanelShape->getString("heigth_label_color");
+        mAvatarHeigthLabelColor = LLUIColorTable::instance().getColor(color, LLColor4::green);
+        color = mPanelShape->getString("heigth_value_label_color");
+        mAvatarHeigthValueLabelColor = LLUIColorTable::instance().getColor(color, LLColor4::green);
+        gSavedSettings.getControl("HeightUnits")->getSignal()->connect(boost::bind(&LLPanelEditWearable::changeHeightUnits, this, _2));
+        updateMetricLayout(gSavedSettings.getBOOL("HeightUnits"));
+
+        return TRUE;
 }
 
 // virtual 
 // LLUICtrl
 BOOL LLPanelEditWearable::isDirty() const
 {
-	BOOL isDirty = FALSE;
-	if (mWearablePtr)
-	{
-		if (mWearablePtr->isDirty() ||
-			mWearableItem->getName().compare(mNameEditor->getText()) != 0)
-		{
-			isDirty = TRUE;
-		}
-	}
-	return isDirty;
+        BOOL isDirty = FALSE;
+        if (mWearablePtr)
+        {
+                if (mWearablePtr->isDirty() ||
+                        mWearableItem->getName().compare(mNameEditor->getText()) != 0)
+                {
+                        isDirty = TRUE;
+                }
+        }
+        return isDirty;
 }
 //virtual
 void LLPanelEditWearable::draw()
 {
-	updateVerbs();
-	if (getWearable() && getWearable()->getType() == LLWearableType::WT_SHAPE)
-	{
-		//updating avatar height
-		updateTypeSpecificControls(LLWearableType::WT_SHAPE);
-	}
+        updateVerbs();
+        if (getWearable() && getWearable()->getType() == LLWearableType::WT_SHAPE)
+        {
+                //updating avatar height
+                updateTypeSpecificControls(LLWearableType::WT_SHAPE);
+        }
 
-	LLPanel::draw();
+        LLPanel::draw();
 }
 
 void LLPanelEditWearable::setVisible(BOOL visible)
 {
-	if (!visible)
-	{
-		showWearable(mWearablePtr, FALSE);
-	}
-	LLPanel::setVisible(visible);
+        if (!visible)
+        {
+                showWearable(mWearablePtr, FALSE);
+        }
+        LLPanel::setVisible(visible);
 }
 
 void LLPanelEditWearable::setWearable(LLWearable *wearable, BOOL disable_camera_switch)
 {
-	showWearable(mWearablePtr, FALSE, disable_camera_switch);
-	mWearablePtr = wearable;
-	showWearable(mWearablePtr, TRUE, disable_camera_switch);
+        showWearable(mWearablePtr, FALSE, disable_camera_switch);
+        mWearablePtr = wearable;
+        showWearable(mWearablePtr, TRUE, disable_camera_switch);
 }
 
 
 //static 
 void LLPanelEditWearable::onRevertButtonClicked(void* userdata)
 {
-	LLPanelEditWearable *panel = (LLPanelEditWearable*) userdata;
-	panel->revertChanges();
+        LLPanelEditWearable *panel = (LLPanelEditWearable*) userdata;
+        panel->revertChanges();
 }
 
 void LLPanelEditWearable::onSaveAsButtonClicked()
 {
-	LLSD args;
-	args["DESC"] = mNameEditor->getText();
+        LLSD args;
+        args["DESC"] = mNameEditor->getText();
 
-	LLNotificationsUtil::add("SaveWearableAs", args, LLSD(), boost::bind(&LLPanelEditWearable::saveAsCallback, this, _1, _2));
+        LLNotificationsUtil::add("SaveWearableAs", args, LLSD(), boost::bind(&LLPanelEditWearable::saveAsCallback, this, _1, _2));
 }
 
 void LLPanelEditWearable::saveAsCallback(const LLSD& notification, const LLSD& response)
 {
-	S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
-	if (0 == option)
-	{
-		std::string wearable_name = response["message"].asString();
-		LLStringUtil::trim(wearable_name);
-		if( !wearable_name.empty() )
-		{
-			mNameEditor->setText(wearable_name);
-			saveChanges(true);
-		}
-	}
+        S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
+        if (0 == option)
+        {
+                std::string wearable_name = response["message"].asString();
+                LLStringUtil::trim(wearable_name);
+                if( !wearable_name.empty() )
+                {
+                        mNameEditor->setText(wearable_name);
+                        saveChanges(true);
+                }
+        }
 }
 
 void LLPanelEditWearable::onCommitSexChange()
 {
-	if (!isAgentAvatarValid()) return;
+        if (!isAgentAvatarValid()) return;
 
-	LLWearableType::EType type = mWearablePtr->getType();
-	U32 index = gAgentWearables.getWearableIndex(mWearablePtr);
+        LLWearableType::EType type = mWearablePtr->getType();
+        U32 index = gAgentWearables.getWearableIndex(mWearablePtr);
 
-	if( !gAgentWearables.isWearableModifiable(type, index))
-	{
-		return;
-	}
+        if( !gAgentWearables.isWearableModifiable(type, index))
+        {
+                return;
+        }
 
-	LLViewerVisualParam* param = static_cast<LLViewerVisualParam*>(gAgentAvatarp->getVisualParam( "male" ));
-	if( !param )
-	{
-		return;
-	}
+        LLViewerVisualParam* param = static_cast<LLViewerVisualParam*>(gAgentAvatarp->getVisualParam( "male" ));
+        if( !param )
+        {
+                return;
+        }
 
-	bool is_new_sex_male = (gSavedSettings.getU32("AvatarSex") ? SEX_MALE : SEX_FEMALE) == SEX_MALE;
-	LLWearable*	wearable = gAgentWearables.getWearable(type, index);
-	if (wearable)
-	{
-		wearable->setVisualParamWeight(param->getID(), is_new_sex_male, FALSE);
-	}
-	param->setWeight( is_new_sex_male, FALSE );
+        bool is_new_sex_male = (gSavedSettings.getU32("AvatarSex") ? SEX_MALE : SEX_FEMALE) == SEX_MALE;
+        LLWearable*     wearable = gAgentWearables.getWearable(type, index);
+        if (wearable)
+        {
+                wearable->setVisualParamWeight(param->getID(), is_new_sex_male, FALSE);
+        }
+        param->setWeight( is_new_sex_male, FALSE );
 
-	gAgentAvatarp->updateSexDependentLayerSets( FALSE );
+        gAgentAvatarp->updateSexDependentLayerSets( FALSE );
 
-	gAgentAvatarp->updateVisualParams();
+        gAgentAvatarp->updateVisualParams();
 
-	updateScrollingPanelUI();
+        updateScrollingPanelUI();
 }
 
 void LLPanelEditWearable::onTexturePickerCommit(const LLUICtrl* ctrl)
 {
-	const LLTextureCtrl* texture_ctrl = dynamic_cast<const LLTextureCtrl*>(ctrl);
-	if (!texture_ctrl)
-	{
-		llwarns << "got commit signal from not LLTextureCtrl." << llendl;
-		return;
-	}
-
-	if (getWearable())
-	{
-		LLWearableType::EType type = getWearable()->getType();
-		const PickerControlEntryNamePredicate name_pred(texture_ctrl->getName());
-		const LLEditWearableDictionary::PickerControlEntry* entry
-			= find_picker_ctrl_entry_if<LLTextureCtrl, PickerControlEntryNamePredicate>(type, name_pred);
-		if (entry)
-		{
-			// Set the new version
-			LLViewerFetchedTexture* image = LLViewerTextureManager::getFetchedTexture(texture_ctrl->getImageAssetID());
-			if( image->getID() == IMG_DEFAULT )
-			{
-				image = LLViewerTextureManager::getFetchedTexture(IMG_DEFAULT_AVATAR);
-			}
-			if (getWearable())
-			{
-				U32 index = gAgentWearables.getWearableIndex(getWearable());
-				gAgentAvatarp->setLocalTexture(entry->mTextureIndex, image, FALSE, index);
-				LLVisualParamHint::requestHintUpdates();
-				gAgentAvatarp->wearableUpdated(type, FALSE);
-			}
-		}
-		else
-		{
-			llwarns << "could not get texture picker dictionary entry for wearable of type: " << type << llendl;
-		}
-	}
+        const LLTextureCtrl* texture_ctrl = dynamic_cast<const LLTextureCtrl*>(ctrl);
+        if (!texture_ctrl)
+        {
+                llwarns << "got commit signal from not LLTextureCtrl." << llendl;
+                return;
+        }
+
+        if (getWearable())
+        {
+                LLWearableType::EType type = getWearable()->getType();
+                const PickerControlEntryNamePredicate name_pred(texture_ctrl->getName());
+                const LLEditWearableDictionary::PickerControlEntry* entry
+                        = find_picker_ctrl_entry_if<LLTextureCtrl, PickerControlEntryNamePredicate>(type, name_pred);
+                if (entry)
+                {
+                        // Set the new version
+                        LLViewerFetchedTexture* image = LLViewerTextureManager::getFetchedTexture(texture_ctrl->getImageAssetID());
+                        if( image->getID() == IMG_DEFAULT )
+                        {
+                                image = LLViewerTextureManager::getFetchedTexture(IMG_DEFAULT_AVATAR);
+                        }
+                        if (getWearable())
+                        {
+                                U32 index = gAgentWearables.getWearableIndex(getWearable());
+                                gAgentAvatarp->setLocalTexture(entry->mTextureIndex, image, FALSE, index);
+                                LLVisualParamHint::requestHintUpdates();
+                                gAgentAvatarp->wearableUpdated(type, FALSE);
+                        }
+                }
+                else
+                {
+                        llwarns << "could not get texture picker dictionary entry for wearable of type: " << type << llendl;
+                }
+        }
 }
 
 void LLPanelEditWearable::onColorSwatchCommit(const LLUICtrl* ctrl)
 {
-	if (getWearable())
-	{
-		LLWearableType::EType type = getWearable()->getType();
-		const PickerControlEntryNamePredicate name_pred(ctrl->getName());
-		const LLEditWearableDictionary::PickerControlEntry* entry
-			= find_picker_ctrl_entry_if<LLColorSwatchCtrl, PickerControlEntryNamePredicate>(type, name_pred);
-		if (entry)
-		{
-			const LLColor4& old_color = getWearable()->getClothesColor(entry->mTextureIndex);
-			const LLColor4& new_color = LLColor4(ctrl->getValue());
-			if( old_color != new_color )
-			{
-				getWearable()->setClothesColor(entry->mTextureIndex, new_color, TRUE);
-				LLVisualParamHint::requestHintUpdates();
-				gAgentAvatarp->wearableUpdated(getWearable()->getType(), FALSE);
-			}
-		}
-		else
-		{
-			llwarns << "could not get color swatch dictionary entry for wearable of type: " << type << llendl;
-		}
-	}
+        if (getWearable())
+        {
+                LLWearableType::EType type = getWearable()->getType();
+                const PickerControlEntryNamePredicate name_pred(ctrl->getName());
+                const LLEditWearableDictionary::PickerControlEntry* entry
+                        = find_picker_ctrl_entry_if<LLColorSwatchCtrl, PickerControlEntryNamePredicate>(type, name_pred);
+                if (entry)
+                {
+                        const LLColor4& old_color = getWearable()->getClothesColor(entry->mTextureIndex);
+                        const LLColor4& new_color = LLColor4(ctrl->getValue());
+                        if( old_color != new_color )
+                        {
+                                getWearable()->setClothesColor(entry->mTextureIndex, new_color, TRUE);
+                                LLVisualParamHint::requestHintUpdates();
+                                gAgentAvatarp->wearableUpdated(getWearable()->getType(), FALSE);
+                        }
+                }
+                else
+                {
+                        llwarns << "could not get color swatch dictionary entry for wearable of type: " << type << llendl;
+                }
+        }
 }
 
 void LLPanelEditWearable::updatePanelPickerControls(LLWearableType::EType type)
 {
-	LLPanel* panel = getPanel(type);
-	if (!panel)
-		return;
-
-	bool is_modifiable = false;
-	bool is_copyable   = false;
-
-	if(mWearableItem)
-	{
-		const LLPermissions& perm = mWearableItem->getPermissions();
-		is_modifiable = perm.allowModifyBy(gAgent.getID(), gAgent.getGroupID());
-		is_copyable = perm.allowCopyBy(gAgent.getID(), gAgent.getGroupID());
-	}
-
-	if (is_modifiable)
-	{
-		// Update picker controls
-		for_each_picker_ctrl_entry <LLColorSwatchCtrl> (panel, type, boost::bind(update_color_swatch_ctrl, this, _1, _2));
-		for_each_picker_ctrl_entry <LLTextureCtrl>     (panel, type, boost::bind(update_texture_ctrl, this, _1, _2));
-	}
-	else
-	{
-		// Disable controls
-		for_each_picker_ctrl_entry <LLColorSwatchCtrl> (panel, type, boost::bind(set_enabled_color_swatch_ctrl, false, _1, _2));
-		for_each_picker_ctrl_entry <LLTextureCtrl>     (panel, type, boost::bind(set_enabled_texture_ctrl, false, _1, _2));
-	}
+        LLPanel* panel = getPanel(type);
+        if (!panel)
+                return;
+
+        bool is_modifiable = false;
+        bool is_copyable   = false;
+
+        if(mWearableItem)
+        {
+                const LLPermissions& perm = mWearableItem->getPermissions();
+                is_modifiable = perm.allowModifyBy(gAgent.getID(), gAgent.getGroupID());
+                is_copyable = perm.allowCopyBy(gAgent.getID(), gAgent.getGroupID());
+        }
+
+        if (is_modifiable)
+        {
+                // Update picker controls
+                for_each_picker_ctrl_entry <LLColorSwatchCtrl> (panel, type, boost::bind(update_color_swatch_ctrl, this, _1, _2));
+                for_each_picker_ctrl_entry <LLTextureCtrl>     (panel, type, boost::bind(update_texture_ctrl, this, _1, _2));
+        }
+        else
+        {
+                // Disable controls
+                for_each_picker_ctrl_entry <LLColorSwatchCtrl> (panel, type, boost::bind(set_enabled_color_swatch_ctrl, false, _1, _2));
+                for_each_picker_ctrl_entry <LLTextureCtrl>     (panel, type, boost::bind(set_enabled_texture_ctrl, false, _1, _2));
+        }
 }
 
 void LLPanelEditWearable::saveChanges(bool force_save_as)
 {
-	if (!mWearablePtr || !isDirty())
-	{
-		// do nothing if no unsaved changes
-		return;
-	}
-
-	U32 index = gAgentWearables.getWearableIndex(mWearablePtr);
-
-	std::string new_name = mNameEditor->getText();
-	if (force_save_as)
-	{
-		// the name of the wearable has changed, re-save wearable with new name
-		LLAppearanceMgr::instance().removeCOFItemLinks(mWearablePtr->getItemID(),false);
-		gAgentWearables.saveWearableAs(mWearablePtr->getType(), index, new_name, FALSE);
-		mNameEditor->setText(mWearableItem->getName());
-	}
-	else
-	{
-		gAgentWearables.saveWearable(mWearablePtr->getType(), index, TRUE, new_name);
-	}
+        if (!mWearablePtr || !isDirty())
+        {
+                // do nothing if no unsaved changes
+                return;
+        }
+
+        U32 index = gAgentWearables.getWearableIndex(mWearablePtr);
+
+        std::string new_name = mNameEditor->getText();
+        if (force_save_as)
+        {
+                // the name of the wearable has changed, re-save wearable with new name
+                LLAppearanceMgr::instance().removeCOFItemLinks(mWearablePtr->getItemID(),false);
+                gAgentWearables.saveWearableAs(mWearablePtr->getType(), index, new_name, FALSE);
+                mNameEditor->setText(mWearableItem->getName());
+        }
+        else
+        {
+                gAgentWearables.saveWearable(mWearablePtr->getType(), index, TRUE, new_name);
+        }
 }
 
 void LLPanelEditWearable::revertChanges()
 {
-	if (!mWearablePtr || !isDirty())
-	{
-		// no unsaved changes to revert
-		return;
-	}
-
-	mWearablePtr->revertValues();
-	mNameEditor->setText(mWearableItem->getName());
-	updatePanelPickerControls(mWearablePtr->getType());
-	updateTypeSpecificControls(mWearablePtr->getType());
-	gAgentAvatarp->wearableUpdated(mWearablePtr->getType(), FALSE);
+        if (!mWearablePtr || !isDirty())
+        {
+                // no unsaved changes to revert
+                return;
+        }
+
+        mWearablePtr->revertValues();
+        mNameEditor->setText(mWearableItem->getName());
+        updatePanelPickerControls(mWearablePtr->getType());
+        updateTypeSpecificControls(mWearablePtr->getType());
+        gAgentAvatarp->wearableUpdated(mWearablePtr->getType(), FALSE);
 }
 
 void LLPanelEditWearable::showWearable(LLWearable* wearable, BOOL show, BOOL disable_camera_switch)
 {
-	if (!wearable)
-	{
-		return;
-	}
-
-	mWearableItem = gInventory.getItem(mWearablePtr->getItemID());
-	llassert(mWearableItem);
-
-	LLWearableType::EType type = wearable->getType();
-	LLPanel *targetPanel = NULL;
-	std::string title;
-	std::string description_title;
-
-	const LLEditWearableDictionary::WearableEntry *wearable_entry = LLEditWearableDictionary::getInstance()->getWearable(type);
-	if (!wearable_entry)
-	{
-		llwarns << "called LLPanelEditWearable::showWearable with an invalid wearable type! (" << type << ")" << llendl;
-		return;
-	}
-
-	targetPanel = getPanel(type);
-	title = getString(wearable_entry->mTitle);
-	description_title = getString(wearable_entry->mDescTitle);
-
-	// Update picker controls state
-	for_each_picker_ctrl_entry <LLColorSwatchCtrl> (targetPanel, type, boost::bind(set_enabled_color_swatch_ctrl, show, _1, _2));
-	for_each_picker_ctrl_entry <LLTextureCtrl>     (targetPanel, type, boost::bind(set_enabled_texture_ctrl, show, _1, _2));
-
-	targetPanel->setVisible(show);
-	toggleTypeSpecificControls(type);
-
-	if (show)
-	{
-		mPanelTitle->setText(title);
-		mPanelTitle->setToolTip(title);
-		mDescTitle->setText(description_title);
-		
-		// set name
-		mNameEditor->setText(mWearableItem->getName());
-
-		updatePanelPickerControls(type);
-		updateTypeSpecificControls(type);
-
-		// clear and rebuild visual param list
-		U8 num_subparts = wearable_entry->mSubparts.size();
-	
-		for (U8 index = 0; index < num_subparts; ++index)
-		{
-			// dive into data structures to get the panel we need
-			ESubpart subpart_e = wearable_entry->mSubparts[index];
-			const LLEditWearableDictionary::SubpartEntry *subpart_entry = LLEditWearableDictionary::getInstance()->getSubpart(subpart_e);
-	
-			if (!subpart_entry)
-			{
-				llwarns << "could not get wearable subpart dictionary entry for subpart: " << subpart_e << llendl;
-				continue;
-			}
-	
-			const std::string scrolling_panel = subpart_entry->mParamList;
-			const std::string accordion_tab = subpart_entry->mAccordionTab;
-	
-			LLScrollingPanelList *panel_list = getChild<LLScrollingPanelList>(scrolling_panel);
-			LLAccordionCtrlTab *tab = getChild<LLAccordionCtrlTab>(accordion_tab);
-	
-			if (!panel_list)
-			{
-				llwarns << "could not get scrolling panel list: " << scrolling_panel << llendl;
-				continue;
-			}
-	
-			if (!tab)
-			{
-				llwarns << "could not get llaccordionctrltab from UI with name: " << accordion_tab << llendl;
-				continue;
-			}
-	
-			// what edit group do we want to extract params for?
-			const std::string edit_group = subpart_entry->mEditGroup;
-	
-			// storage for ordered list of visual params
-			value_map_t sorted_params;
-			getSortedParams(sorted_params, edit_group);
-
-			LLJoint* jointp = gAgentAvatarp->getJoint( subpart_entry->mTargetJoint );
-			if (!jointp)
-			{
-				jointp = gAgentAvatarp->getJoint("mHead");
-			}
-
-			buildParamList(panel_list, sorted_params, tab, jointp);
-	
-			updateScrollingPanelUI();
-		}
-		if (!disable_camera_switch)
-		{
-			showDefaultSubpart();
-		}
-
-		updateVerbs();
-	}
+        if (!wearable)
+        {
+                return;
+        }
+
+        mWearableItem = gInventory.getItem(mWearablePtr->getItemID());
+        llassert(mWearableItem);
+
+        LLWearableType::EType type = wearable->getType();
+        LLPanel *targetPanel = NULL;
+        std::string title;
+        std::string description_title;
+
+        const LLEditWearableDictionary::WearableEntry *wearable_entry = LLEditWearableDictionary::getInstance()->getWearable(type);
+        if (!wearable_entry)
+        {
+                llwarns << "called LLPanelEditWearable::showWearable with an invalid wearable type! (" << type << ")" << llendl;
+                return;
+        }
+
+        targetPanel = getPanel(type);
+        title = getString(wearable_entry->mTitle);
+        description_title = getString(wearable_entry->mDescTitle);
+
+        // Update picker controls state
+        for_each_picker_ctrl_entry <LLColorSwatchCtrl> (targetPanel, type, boost::bind(set_enabled_color_swatch_ctrl, show, _1, _2));
+        for_each_picker_ctrl_entry <LLTextureCtrl>     (targetPanel, type, boost::bind(set_enabled_texture_ctrl, show, _1, _2));
+
+        targetPanel->setVisible(show);
+        toggleTypeSpecificControls(type);
+
+        if (show)
+        {
+                mPanelTitle->setText(title);
+                mPanelTitle->setToolTip(title);
+                mDescTitle->setText(description_title);
+                
+                // set name
+                mNameEditor->setText(mWearableItem->getName());
+
+                updatePanelPickerControls(type);
+                updateTypeSpecificControls(type);
+
+                // clear and rebuild visual param list
+                U8 num_subparts = wearable_entry->mSubparts.size();
+        
+                for (U8 index = 0; index < num_subparts; ++index)
+                {
+                        // dive into data structures to get the panel we need
+                        ESubpart subpart_e = wearable_entry->mSubparts[index];
+                        const LLEditWearableDictionary::SubpartEntry *subpart_entry = LLEditWearableDictionary::getInstance()->getSubpart(subpart_e);
+        
+                        if (!subpart_entry)
+                        {
+                                llwarns << "could not get wearable subpart dictionary entry for subpart: " << subpart_e << llendl;
+                                continue;
+                        }
+        
+                        const std::string scrolling_panel = subpart_entry->mParamList;
+                        const std::string accordion_tab = subpart_entry->mAccordionTab;
+        
+                        LLScrollingPanelList *panel_list = getChild<LLScrollingPanelList>(scrolling_panel);
+                        LLAccordionCtrlTab *tab = getChild<LLAccordionCtrlTab>(accordion_tab);
+        
+                        if (!panel_list)
+                        {
+                                llwarns << "could not get scrolling panel list: " << scrolling_panel << llendl;
+                                continue;
+                        }
+        
+                        if (!tab)
+                        {
+                                llwarns << "could not get llaccordionctrltab from UI with name: " << accordion_tab << llendl;
+                                continue;
+                        }
+        
+                        // what edit group do we want to extract params for?
+                        const std::string edit_group = subpart_entry->mEditGroup;
+        
+                        // storage for ordered list of visual params
+                        value_map_t sorted_params;
+                        getSortedParams(sorted_params, edit_group);
+
+                        LLJoint* jointp = gAgentAvatarp->getJoint( subpart_entry->mTargetJoint );
+                        if (!jointp)
+                        {
+                                jointp = gAgentAvatarp->getJoint("mHead");
+                        }
+
+                        buildParamList(panel_list, sorted_params, tab, jointp);
+        
+                        updateScrollingPanelUI();
+                }
+                if (!disable_camera_switch)
+                {
+                        showDefaultSubpart();
+                }
+
+                updateVerbs();
+        }
 }
 
 void LLPanelEditWearable::showDefaultSubpart()
 {
-	changeCamera(3);
+        changeCamera(3);
 }
 
 void LLPanelEditWearable::onTabExpandedCollapsed(const LLSD& param, U8 index)
 {
-	bool expanded = param.asBoolean();
+        bool expanded = param.asBoolean();
 
-	if (!mWearablePtr || !gAgentCamera.cameraCustomizeAvatar())
-	{
-		// we don't have a valid wearable we're editing, or we've left the wearable editor
-		return;
-	}
+        if (!mWearablePtr || !gAgentCamera.cameraCustomizeAvatar())
+        {
+                // we don't have a valid wearable we're editing, or we've left the wearable editor
+                return;
+        }
 
-	if (expanded)
-	{
-		changeCamera(index);
-	}
+        if (expanded)
+        {
+                changeCamera(index);
+        }
 
 }
 
 void LLPanelEditWearable::changeCamera(U8 subpart)
 {
-	const LLEditWearableDictionary::WearableEntry *wearable_entry = LLEditWearableDictionary::getInstance()->getWearable(mWearablePtr->getType());
-	if (!wearable_entry)
-	{
-		llinfos << "could not get wearable dictionary entry for wearable type: " << mWearablePtr->getType() << llendl;
-		return;
-	}
-
-	if (subpart >= wearable_entry->mSubparts.size())
-	{
-		llinfos << "accordion tab expanded for invalid subpart. Wearable type: " << mWearablePtr->getType() << " subpart num: " << subpart << llendl;
-		return;
-	}
-
-	ESubpart subpart_e = wearable_entry->mSubparts[subpart];
-	const LLEditWearableDictionary::SubpartEntry *subpart_entry = LLEditWearableDictionary::getInstance()->getSubpart(subpart_e);
-
-	if (!subpart_entry)
-	{
-		llwarns << "could not get wearable subpart dictionary entry for subpart: " << subpart_e << llendl;
-		return;
-	}
-
-	// Update the camera
-	gMorphView->setCameraTargetJoint( gAgentAvatarp->getJoint( subpart_entry->mTargetJoint ) );
-	gMorphView->setCameraTargetOffset( subpart_entry->mTargetOffset );
-	gMorphView->setCameraOffset( subpart_entry->mCameraOffset );
-	if (gSavedSettings.getBOOL("AppearanceCameraMovement"))
-	{
-		gMorphView->updateCamera();
-	}
+        const LLEditWearableDictionary::WearableEntry *wearable_entry = LLEditWearableDictionary::getInstance()->getWearable(mWearablePtr->getType());
+        if (!wearable_entry)
+        {
+                llinfos << "could not get wearable dictionary entry for wearable type: " << mWearablePtr->getType() << llendl;
+                return;
+        }
+
+        if (subpart >= wearable_entry->mSubparts.size())
+        {
+                llinfos << "accordion tab expanded for invalid subpart. Wearable type: " << mWearablePtr->getType() << " subpart num: " << subpart << llendl;
+                return;
+        }
+
+        ESubpart subpart_e = wearable_entry->mSubparts[subpart];
+        const LLEditWearableDictionary::SubpartEntry *subpart_entry = LLEditWearableDictionary::getInstance()->getSubpart(subpart_e);
+
+        if (!subpart_entry)
+        {
+                llwarns << "could not get wearable subpart dictionary entry for subpart: " << subpart_e << llendl;
+                return;
+        }
+
+        // Update the camera
+        gMorphView->setCameraTargetJoint( gAgentAvatarp->getJoint( subpart_entry->mTargetJoint ) );
+        gMorphView->setCameraTargetOffset( subpart_entry->mTargetOffset );
+        gMorphView->setCameraOffset( subpart_entry->mCameraOffset );
+        if (gSavedSettings.getBOOL("AppearanceCameraMovement"))
+        {
+                gMorphView->updateCamera();
+        }
 }
 
 void LLPanelEditWearable::updateScrollingPanelList()
 {
-	updateScrollingPanelUI();
+        updateScrollingPanelUI();
 }
 
 void LLPanelEditWearable::toggleTypeSpecificControls(LLWearableType::EType type)
 {
-	// Toggle controls specific to shape editing panel.
-	{
-		bool is_shape = (type == LLWearableType::WT_SHAPE);
-		getChildView("sex_radio")->setVisible( is_shape);
-		getChildView("female_icon")->setVisible( is_shape);
-		getChildView("male_icon")->setVisible( is_shape);
-	}
+        // Toggle controls specific to shape editing panel.
+        {
+                bool is_shape = (type == LLWearableType::WT_SHAPE);
+                getChildView("sex_radio")->setVisible( is_shape);
+                getChildView("female_icon")->setVisible( is_shape);
+                getChildView("male_icon")->setVisible( is_shape);
+        }
 }
 
 void LLPanelEditWearable::updateTypeSpecificControls(LLWearableType::EType type)
 {
-	const F32 ONE_METER = 1.0;
-	const F32 ONE_FOOT = 0.3048 * ONE_METER; // in meters
-	// Update controls specific to shape editing panel.
-	if (type == LLWearableType::WT_SHAPE)
-	{
-		// Update avatar height
-		F32 new_size = gAgentAvatarp->mBodySize.mV[VZ];
-		if (gSavedSettings.getBOOL("HeightUnits") == FALSE)
-		{
-			// convert meters to feet
-			new_size = new_size / ONE_FOOT;
-		}
-
-		std::string avatar_height_str = llformat("%.2f", new_size);
-		mHeigthValue.setArg("[HEIGHT]", avatar_height_str);
-		updateAvatarHeightLabel();
-	}
-
-	if (LLWearableType::WT_ALPHA == type)
-	{
-		updateAlphaCheckboxes();
-
-		initPreviousAlphaTextures();
-	}
+        const F32 ONE_METER = 1.0;
+        const F32 ONE_FOOT = 0.3048 * ONE_METER; // in meters
+        // Update controls specific to shape editing panel.
+        if (type == LLWearableType::WT_SHAPE)
+        {
+                // Update avatar height
+                F32 new_size = gAgentAvatarp->mBodySize.mV[VZ];
+                if (gSavedSettings.getBOOL("HeightUnits") == FALSE)
+                {
+                        // convert meters to feet
+                        new_size = new_size / ONE_FOOT;
+                }
+
+                std::string avatar_height_str = llformat("%.2f", new_size);
+                mHeigthValue.setArg("[HEIGHT]", avatar_height_str);
+                updateAvatarHeightLabel();
+        }
+
+        if (LLWearableType::WT_ALPHA == type)
+        {
+                updateAlphaCheckboxes();
+
+                initPreviousAlphaTextures();
+        }
 }
 
 void LLPanelEditWearable::updateScrollingPanelUI()
 {
-	// do nothing if we don't have a valid wearable we're editing
-	if (mWearablePtr == NULL)
-	{
-		return;
-	}
-
-	LLWearableType::EType type = mWearablePtr->getType();
-	LLPanel *panel = getPanel(type);
-
-	if(panel && (mWearablePtr->getItemID().notNull()))
-	{
-		const LLEditWearableDictionary::WearableEntry *wearable_entry = LLEditWearableDictionary::getInstance()->getWearable(type);
-		llassert(wearable_entry);
-		if (!wearable_entry) return;
-		U8 num_subparts = wearable_entry->mSubparts.size();
-
-		LLScrollingPanelParam::sUpdateDelayFrames = 0;
-		for (U8 index = 0; index < num_subparts; ++index)
-		{
-			// dive into data structures to get the panel we need
-			ESubpart subpart_e = wearable_entry->mSubparts[index];
-			const LLEditWearableDictionary::SubpartEntry *subpart_entry = LLEditWearableDictionary::getInstance()->getSubpart(subpart_e);
-
-			const std::string scrolling_panel = subpart_entry->mParamList;
-
-			LLScrollingPanelList *panel_list = getChild<LLScrollingPanelList>(scrolling_panel);
-	
-			if (!panel_list)
-			{
-				llwarns << "could not get scrolling panel list: " << scrolling_panel << llendl;
-				continue;
-			}
-			
-			panel_list->updatePanels(TRUE);
-		}
-	}
+        // do nothing if we don't have a valid wearable we're editing
+        if (mWearablePtr == NULL)
+        {
+                return;
+        }
+
+        LLWearableType::EType type = mWearablePtr->getType();
+        LLPanel *panel = getPanel(type);
+
+        if(panel && (mWearablePtr->getItemID().notNull()))
+        {
+                const LLEditWearableDictionary::WearableEntry *wearable_entry = LLEditWearableDictionary::getInstance()->getWearable(type);
+                llassert(wearable_entry);
+                if (!wearable_entry) return;
+                U8 num_subparts = wearable_entry->mSubparts.size();
+
+                LLScrollingPanelParam::sUpdateDelayFrames = 0;
+                for (U8 index = 0; index < num_subparts; ++index)
+                {
+                        // dive into data structures to get the panel we need
+                        ESubpart subpart_e = wearable_entry->mSubparts[index];
+                        const LLEditWearableDictionary::SubpartEntry *subpart_entry = LLEditWearableDictionary::getInstance()->getSubpart(subpart_e);
+
+                        const std::string scrolling_panel = subpart_entry->mParamList;
+
+                        LLScrollingPanelList *panel_list = getChild<LLScrollingPanelList>(scrolling_panel);
+        
+                        if (!panel_list)
+                        {
+                                llwarns << "could not get scrolling panel list: " << scrolling_panel << llendl;
+                                continue;
+                        }
+                        
+                        panel_list->updatePanels(TRUE);
+                }
+        }
 }
 
 LLPanel* LLPanelEditWearable::getPanel(LLWearableType::EType type)
 {
-	switch (type)
-	{
-		case LLWearableType::WT_SHAPE:
-			return mPanelShape;
-			break;
+        switch (type)
+        {
+                case LLWearableType::WT_SHAPE:
+                        return mPanelShape;
+                        break;
 
-		case LLWearableType::WT_SKIN:
-			return mPanelSkin;
-			break;
+                case LLWearableType::WT_SKIN:
+                        return mPanelSkin;
+                        break;
 
-		case LLWearableType::WT_HAIR:
-			return mPanelHair;
-			break;
+                case LLWearableType::WT_HAIR:
+                        return mPanelHair;
+                        break;
 
-		case LLWearableType::WT_EYES:
-			return mPanelEyes;
-			break;
+                case LLWearableType::WT_EYES:
+                        return mPanelEyes;
+                        break;
 
-		case LLWearableType::WT_SHIRT:
-			return mPanelShirt;
-			break;
+                case LLWearableType::WT_SHIRT:
+                        return mPanelShirt;
+                        break;
 
-		case LLWearableType::WT_PANTS:
-			return mPanelPants;
-			break;
+                case LLWearableType::WT_PANTS:
+                        return mPanelPants;
+                        break;
 
-		case LLWearableType::WT_SHOES:
-			return mPanelShoes;
-			break;
+                case LLWearableType::WT_SHOES:
+                        return mPanelShoes;
+                        break;
 
-		case LLWearableType::WT_SOCKS:
-			return mPanelSocks;
-			break;
+                case LLWearableType::WT_SOCKS:
+                        return mPanelSocks;
+                        break;
 
-		case LLWearableType::WT_JACKET:
-			return mPanelJacket;
-			break;
+                case LLWearableType::WT_JACKET:
+                        return mPanelJacket;
+                        break;
 
-		case LLWearableType::WT_GLOVES:
-			return mPanelGloves;
-			break;
+                case LLWearableType::WT_GLOVES:
+                        return mPanelGloves;
+                        break;
 
-		case LLWearableType::WT_UNDERSHIRT:
-			return mPanelUndershirt;
-			break;
+                case LLWearableType::WT_UNDERSHIRT:
+                        return mPanelUndershirt;
+                        break;
 
-		case LLWearableType::WT_UNDERPANTS:
-			return mPanelUnderpants;
-			break;
+                case LLWearableType::WT_UNDERPANTS:
+                        return mPanelUnderpants;
+                        break;
 
-		case LLWearableType::WT_SKIRT:
-			return mPanelSkirt;
-			break;
+                case LLWearableType::WT_SKIRT:
+                        return mPanelSkirt;
+                        break;
 
-		case LLWearableType::WT_ALPHA:
-			return mPanelAlpha;
-			break;
+                case LLWearableType::WT_ALPHA:
+                        return mPanelAlpha;
+                        break;
 
-		case LLWearableType::WT_TATTOO:
-			return mPanelTattoo;
-			break;
+                case LLWearableType::WT_TATTOO:
+                        return mPanelTattoo;
+                        break;
 
-		case LLWearableType::WT_PHYSICS:
-			return mPanelPhysics;
-			break;
+                case LLWearableType::WT_PHYSICS:
+                        return mPanelPhysics;
+                        break;
 
-		default:
-			break;
-	}
-	return NULL;
+                default:
+                        break;
+        }
+        return NULL;
 }
 
 void LLPanelEditWearable::getSortedParams(value_map_t &sorted_params, const std::string &edit_group)
 {
-	LLWearable::visual_param_vec_t param_list;
-	ESex avatar_sex = gAgentAvatarp->getSex();
-
-	mWearablePtr->getVisualParams(param_list);
-
-	for (LLWearable::visual_param_vec_t::iterator iter = param_list.begin();
-		iter != param_list.end();
-		++iter)
-	{
-		LLViewerVisualParam *param = (LLViewerVisualParam*) *iter;
-
-		if (param->getID() == -1 
-			|| !param->isTweakable()
-			|| param->getEditGroup() != edit_group 
-			|| !(param->getSex() & avatar_sex))
-		{
-			continue;
-		}
-
-		value_map_t::value_type vt(-param->getDisplayOrder(), param);
-		llassert( sorted_params.find(-param->getDisplayOrder()) == sorted_params.end() ); //check for duplicates
-		sorted_params.insert(vt);
-	}
+        LLWearable::visual_param_vec_t param_list;
+        ESex avatar_sex = gAgentAvatarp->getSex();
+
+        mWearablePtr->getVisualParams(param_list);
+
+        for (LLWearable::visual_param_vec_t::iterator iter = param_list.begin();
+                iter != param_list.end();
+                ++iter)
+        {
+                LLViewerVisualParam *param = (LLViewerVisualParam*) *iter;
+
+                if (param->getID() == -1 
+                        || !param->isTweakable()
+                        || param->getEditGroup() != edit_group 
+                        || !(param->getSex() & avatar_sex))
+                {
+                        continue;
+                }
+
+                value_map_t::value_type vt(-param->getDisplayOrder(), param);
+                llassert( sorted_params.find(-param->getDisplayOrder()) == sorted_params.end() ); //check for duplicates
+                sorted_params.insert(vt);
+        }
 }
 
 void LLPanelEditWearable::buildParamList(LLScrollingPanelList *panel_list, value_map_t &sorted_params, LLAccordionCtrlTab *tab, LLJoint* jointp)
 {
-	// sorted_params is sorted according to magnitude of effect from
-	// least to greatest.  Adding to the front of the child list
-	// reverses that order.
-	if( panel_list )
-	{
-		panel_list->clearPanels();
-		value_map_t::iterator end = sorted_params.end();
-		S32 height = 0;
-		for(value_map_t::iterator it = sorted_params.begin(); it != end; ++it)
-		{
-			LLPanel::Params p;
-			p.name("LLScrollingPanelParam");
-			LLWearable *wearable = this->getWearable();
-			LLScrollingPanelParamBase *panel_param = NULL;
-			if (wearable && wearable->getType() == LLWearableType::WT_PHYSICS) // Hack to show a different panel for physics.  Should generalize this later.
-			{
-				panel_param = new LLScrollingPanelParamBase( p, NULL, (*it).second, TRUE, this->getWearable(), jointp);
-			}
-			else
-			{
-				panel_param = new LLScrollingPanelParam( p, NULL, (*it).second, TRUE, this->getWearable(), jointp);
-			}
-			height = panel_list->addPanel( panel_param );
-		}
-	}
+        // sorted_params is sorted according to magnitude of effect from
+        // least to greatest.  Adding to the front of the child list
+        // reverses that order.
+        if( panel_list )
+        {
+                panel_list->clearPanels();
+                value_map_t::iterator end = sorted_params.end();
+                S32 height = 0;
+                for(value_map_t::iterator it = sorted_params.begin(); it != end; ++it)
+                {
+                        LLPanel::Params p;
+                        p.name("LLScrollingPanelParam");
+                        LLWearable *wearable = this->getWearable();
+                        LLScrollingPanelParamBase *panel_param = NULL;
+                        if (wearable && wearable->getType() == LLWearableType::WT_PHYSICS) // Hack to show a different panel for physics.  Should generalize this later.
+                        {
+                                panel_param = new LLScrollingPanelParamBase( p, NULL, (*it).second, TRUE, this->getWearable(), jointp);
+                        }
+                        else
+                        {
+                                panel_param = new LLScrollingPanelParam( p, NULL, (*it).second, TRUE, this->getWearable(), jointp);
+                        }
+                        height = panel_list->addPanel( panel_param );
+                }
+        }
 }
 
 void LLPanelEditWearable::updateVerbs()
 {
-	bool can_copy = false;
+        bool can_copy = false;
 
-	if(mWearableItem)
-	{
-		can_copy = mWearableItem->getPermissions().allowCopyBy(gAgentID);
-	}
+        if(mWearableItem)
+        {
+                can_copy = mWearableItem->getPermissions().allowCopyBy(gAgentID);
+        }
 
-	BOOL is_dirty = isDirty();
+        BOOL is_dirty = isDirty();
 
-	mBtnRevert->setEnabled(is_dirty);
-	getChildView("save_as_button")->setEnabled(is_dirty && can_copy);
+        mBtnRevert->setEnabled(is_dirty);
+        getChildView("save_as_button")->setEnabled(is_dirty && can_copy);
 
-	if(isAgentAvatarValid())
-	{
-		// Update viewer's radio buttons (of RadioGroup with control_name="AvatarSex") of Avatar's gender
-		// with value from "AvatarSex" setting
-		gSavedSettings.setU32("AvatarSex", (gAgentAvatarp->getSex() == SEX_MALE) );
-	}
+        if(isAgentAvatarValid())
+        {
+                // Update viewer's radio buttons (of RadioGroup with control_name="AvatarSex") of Avatar's gender
+                // with value from "AvatarSex" setting
+                gSavedSettings.setU32("AvatarSex", (gAgentAvatarp->getSex() == SEX_MALE) );
+        }
 
-	// update back button and title according to dirty state.
-	static BOOL was_dirty = FALSE;
-	if (was_dirty != is_dirty) // to avoid redundant changes because this method is called from draw
-	{
-		static S32 label_width = mBtnBack->getFont()->getWidth(mBackBtnLabel);
-		const std::string& label = is_dirty ? mBackBtnLabel : LLStringUtil::null;
-		const S32 delta_width = is_dirty ? label_width : -label_width;
+        // update back button and title according to dirty state.
+        static BOOL was_dirty = FALSE;
+        if (was_dirty != is_dirty) // to avoid redundant changes because this method is called from draw
+        {
+                static S32 label_width = mBtnBack->getFont()->getWidth(mBackBtnLabel);
+                const std::string& label = is_dirty ? mBackBtnLabel : LLStringUtil::null;
+                const S32 delta_width = is_dirty ? label_width : -label_width;
 
-		mBtnBack->setLabel(label);
+                mBtnBack->setLabel(label);
 
-		// update rect according to label width
-		LLRect rect = mBtnBack->getRect();
-		rect.mRight += delta_width;
-		mBtnBack->setShape(rect);
+                // update rect according to label width
+                LLRect rect = mBtnBack->getRect();
+                rect.mRight += delta_width;
+                mBtnBack->setShape(rect);
 
-		// update title rect according to back button width
-		rect = mPanelTitle->getRect();
-		rect.mLeft += delta_width;
-		mPanelTitle->setShape(rect);
+                // update title rect according to back button width
+                rect = mPanelTitle->getRect();
+                rect.mLeft += delta_width;
+                mPanelTitle->setShape(rect);
 
-		was_dirty = is_dirty;
-	}
+                was_dirty = is_dirty;
+        }
 }
 
 void LLPanelEditWearable::configureAlphaCheckbox(LLVOAvatarDefines::ETextureIndex te, const std::string& name)
 {
-	LLCheckBoxCtrl* checkbox = mPanelAlpha->getChild<LLCheckBoxCtrl>(name);
-	checkbox->setCommitCallback(boost::bind(&LLPanelEditWearable::onInvisibilityCommit, this, checkbox, te));
+        LLCheckBoxCtrl* checkbox = mPanelAlpha->getChild<LLCheckBoxCtrl>(name);
+        checkbox->setCommitCallback(boost::bind(&LLPanelEditWearable::onInvisibilityCommit, this, checkbox, te));
 
-	mAlphaCheckbox2Index[name] = te;
+        mAlphaCheckbox2Index[name] = te;
 }
 
 void LLPanelEditWearable::onInvisibilityCommit(LLCheckBoxCtrl* checkbox_ctrl, LLVOAvatarDefines::ETextureIndex te)
 {
-	if (!checkbox_ctrl) return;
-	if (!getWearable()) return;
-
-	llinfos << "onInvisibilityCommit, self " << this << " checkbox_ctrl " << checkbox_ctrl << llendl;
-
-	bool new_invis_state = checkbox_ctrl->get();
-	if (new_invis_state)
-	{
-		LLLocalTextureObject *lto = getWearable()->getLocalTextureObject(te);
-		mPreviousAlphaTexture[te] = lto->getID();
-		
-		LLViewerFetchedTexture* image = LLViewerTextureManager::getFetchedTexture( IMG_INVISIBLE );
-		U32 index = gAgentWearables.getWearableIndex(getWearable());
-		gAgentAvatarp->setLocalTexture(te, image, FALSE, index);
-		gAgentAvatarp->wearableUpdated(getWearable()->getType(), FALSE);
-	}
-	else
-	{
-		// Try to restore previous texture, if any.
-		LLUUID prev_id = mPreviousAlphaTexture[te];
-		if (prev_id.isNull() || (prev_id == IMG_INVISIBLE))
-		{
-			prev_id = LLUUID( gSavedSettings.getString( "UIImgDefaultAlphaUUID" ) );
-		}
-		if (prev_id.isNull()) return;
-		
-		LLViewerFetchedTexture* image = LLViewerTextureManager::getFetchedTexture(prev_id);
-		if (!image) return;
-
-		U32 index = gAgentWearables.getWearableIndex(getWearable());
-		gAgentAvatarp->setLocalTexture(te, image, FALSE, index);
-		gAgentAvatarp->wearableUpdated(getWearable()->getType(), FALSE);
-	}
-
-	updatePanelPickerControls(getWearable()->getType());
+        if (!checkbox_ctrl) return;
+        if (!getWearable()) return;
+
+        llinfos << "onInvisibilityCommit, self " << this << " checkbox_ctrl " << checkbox_ctrl << llendl;
+
+        bool new_invis_state = checkbox_ctrl->get();
+        if (new_invis_state)
+        {
+                LLLocalTextureObject *lto = getWearable()->getLocalTextureObject(te);
+                mPreviousAlphaTexture[te] = lto->getID();
+                
+                LLViewerFetchedTexture* image = LLViewerTextureManager::getFetchedTexture( IMG_INVISIBLE );
+                U32 index = gAgentWearables.getWearableIndex(getWearable());
+                gAgentAvatarp->setLocalTexture(te, image, FALSE, index);
+                gAgentAvatarp->wearableUpdated(getWearable()->getType(), FALSE);
+        }
+        else
+        {
+                // Try to restore previous texture, if any.
+                LLUUID prev_id = mPreviousAlphaTexture[te];
+                if (prev_id.isNull() || (prev_id == IMG_INVISIBLE))
+                {
+                        prev_id = LLUUID( gSavedSettings.getString( "UIImgDefaultAlphaUUID" ) );
+                }
+                if (prev_id.isNull()) return;
+                
+                LLViewerFetchedTexture* image = LLViewerTextureManager::getFetchedTexture(prev_id);
+                if (!image) return;
+
+                U32 index = gAgentWearables.getWearableIndex(getWearable());
+                gAgentAvatarp->setLocalTexture(te, image, FALSE, index);
+                gAgentAvatarp->wearableUpdated(getWearable()->getType(), FALSE);
+        }
+
+        updatePanelPickerControls(getWearable()->getType());
 }
 
 void LLPanelEditWearable::updateAlphaCheckboxes()
 {
-	for(string_texture_index_map_t::iterator iter = mAlphaCheckbox2Index.begin();
-		iter != mAlphaCheckbox2Index.end(); ++iter )
-	{
-		LLVOAvatarDefines::ETextureIndex te = (LLVOAvatarDefines::ETextureIndex)iter->second;
-		LLCheckBoxCtrl* ctrl = mPanelAlpha->getChild<LLCheckBoxCtrl>(iter->first);
-		if (ctrl)
-		{
-			ctrl->set(!gAgentAvatarp->isTextureVisible(te, mWearablePtr));
-		}
-	}
+        for(string_texture_index_map_t::iterator iter = mAlphaCheckbox2Index.begin();
+                iter != mAlphaCheckbox2Index.end(); ++iter )
+        {
+                LLVOAvatarDefines::ETextureIndex te = (LLVOAvatarDefines::ETextureIndex)iter->second;
+                LLCheckBoxCtrl* ctrl = mPanelAlpha->getChild<LLCheckBoxCtrl>(iter->first);
+                if (ctrl)
+                {
+                        ctrl->set(!gAgentAvatarp->isTextureVisible(te, mWearablePtr));
+                }
+        }
 }
 
 void LLPanelEditWearable::initPreviousAlphaTextures()
 {
-	initPreviousAlphaTextureEntry(TEX_LOWER_ALPHA);
-	initPreviousAlphaTextureEntry(TEX_UPPER_ALPHA);
-	initPreviousAlphaTextureEntry(TEX_HEAD_ALPHA);
-	initPreviousAlphaTextureEntry(TEX_EYES_ALPHA);
-	initPreviousAlphaTextureEntry(TEX_LOWER_ALPHA);
+        initPreviousAlphaTextureEntry(TEX_LOWER_ALPHA);
+        initPreviousAlphaTextureEntry(TEX_UPPER_ALPHA);
+        initPreviousAlphaTextureEntry(TEX_HEAD_ALPHA);
+        initPreviousAlphaTextureEntry(TEX_EYES_ALPHA);
+        initPreviousAlphaTextureEntry(TEX_LOWER_ALPHA);
 }
 
 void LLPanelEditWearable::initPreviousAlphaTextureEntry(LLVOAvatarDefines::ETextureIndex te)
 {
-	LLLocalTextureObject *lto = getWearable()->getLocalTextureObject(te);
-	if (lto)
-	{
-		mPreviousAlphaTexture[te] = lto->getID();
-	}
+        LLLocalTextureObject *lto = getWearable()->getLocalTextureObject(te);
+        if (lto)
+        {
+                mPreviousAlphaTexture[te] = lto->getID();
+        }
 }
 
 // handle secondlife:///app/metricsystem
 class LLMetricSystemHandler : public LLCommandHandler
 {
 public:
-	LLMetricSystemHandler() : LLCommandHandler("metricsystem", UNTRUSTED_THROTTLE) { }
-
-	bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web)
-	{
-		// change height units TRUE for meters and FALSE for feet
-		BOOL new_value = (gSavedSettings.getBOOL("HeightUnits") == FALSE) ? TRUE : FALSE;
-		gSavedSettings.setBOOL("HeightUnits", new_value);
-		return true;
-	}
+        LLMetricSystemHandler() : LLCommandHandler("metricsystem", UNTRUSTED_THROTTLE) { }
+
+        bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web)
+        {
+                // change height units TRUE for meters and FALSE for feet
+                BOOL new_value = (gSavedSettings.getBOOL("HeightUnits") == FALSE) ? TRUE : FALSE;
+                gSavedSettings.setBOOL("HeightUnits", new_value);
+                return true;
+        }
 };
 
 LLMetricSystemHandler gMetricSystemHandler;
diff --git a/indra/newview/llphysicsmotion.cpp b/indra/newview/llphysicsmotion.cpp
index 73de1cef3f..53809b4d19 100644
--- a/indra/newview/llphysicsmotion.cpp
+++ b/indra/newview/llphysicsmotion.cpp
@@ -52,9 +52,9 @@ typedef std::map<std::string, F32> default_controller_map_t;
 

 inline F64 llsgn(const F64 a)

 {

-	if (a >= 0)

-		return 1;

-	return -1;

+        if (a >= 0)

+                return 1;

+        return -1;

 }

 

 /* 

@@ -71,161 +71,161 @@ inline F64 llsgn(const F64 a)
 class LLPhysicsMotion

 {

 public:

-	/*

-	  param_user_name: The param (if any) that the user sees and controls.  This is what

-	  the particular property would look like without physics.  For example, it may be

-	  the breast gravity.  This param's value should will not be altered, and is only

-	  used as a reference point for the rest position of the body party.  This is usually

-	  a driver param and the param(s) that physics is altering are the driven params.

-

-	  param_driven_name: The param whose value is actually set by the physics.  If you

-	  leave this blank (which should suffice normally), the physics will assume that

-	  param_user_name is a driver param and will set the params that the driver is

-	  in charge of (i.e. the "driven" params).

-

-	  joint_name: The joint that the body part is attached to.  The joint is

-	  used to determine the orientation (rotation) of the body part.

-

-	  character: The avatar that this physics affects.

-

-	  motion_direction_vec: The direction (in world coordinates) that determines the

-	  motion.  For example, (0,0,1) is up-down, and means that up-down motion is what

-	  determines how this joint moves.

-

-	  controllers: The various settings (e.g. spring force, mass) that determine how

-	  the body part behaves.

-	*/

-	LLPhysicsMotion(const std::string &param_user_name, 

-			const std::string &param_driven_name,

-			const std::string &joint_name,

-			LLCharacter *character,

-			const LLVector3 &motion_direction_vec,

-			const controller_map_t &controllers) :

-		mParamUserName(param_user_name),

-		mParamDrivenName(param_driven_name),

-		mJointName(joint_name),

-		mMotionDirectionVec(motion_direction_vec),

-		mParamUser(NULL),

-		mParamDriven(NULL),

-

-		mParamControllers(controllers),

-		mCharacter(character),

-		mLastTime(0),

-		mPosition_local(0),

-		mVelocityJoint_local(0),

-		mPositionLastUpdate_local(0)

-	{

-		mJointState = new LLJointState;

-	}

-

-	BOOL initialize();

-

-	~LLPhysicsMotion() {}

-

-	BOOL onUpdate(F32 time);

-

-	LLPointer<LLJointState> getJointState() 

-	{

-		return mJointState;

-	}

+        /*

+          param_user_name: The param (if any) that the user sees and controls.  This is what

+          the particular property would look like without physics.  For example, it may be

+          the breast gravity.  This param's value should will not be altered, and is only

+          used as a reference point for the rest position of the body party.  This is usually

+          a driver param and the param(s) that physics is altering are the driven params.

+

+          param_driven_name: The param whose value is actually set by the physics.  If you

+          leave this blank (which should suffice normally), the physics will assume that

+          param_user_name is a driver param and will set the params that the driver is

+          in charge of (i.e. the "driven" params).

+

+          joint_name: The joint that the body part is attached to.  The joint is

+          used to determine the orientation (rotation) of the body part.

+

+          character: The avatar that this physics affects.

+

+          motion_direction_vec: The direction (in world coordinates) that determines the

+          motion.  For example, (0,0,1) is up-down, and means that up-down motion is what

+          determines how this joint moves.

+

+          controllers: The various settings (e.g. spring force, mass) that determine how

+          the body part behaves.

+        */

+        LLPhysicsMotion(const std::string &param_user_name, 

+                        const std::string &param_driven_name,

+                        const std::string &joint_name,

+                        LLCharacter *character,

+                        const LLVector3 &motion_direction_vec,

+                        const controller_map_t &controllers) :

+                mParamUserName(param_user_name),

+                mParamDrivenName(param_driven_name),

+                mJointName(joint_name),

+                mMotionDirectionVec(motion_direction_vec),

+                mParamUser(NULL),

+                mParamDriven(NULL),

+

+                mParamControllers(controllers),

+                mCharacter(character),

+                mLastTime(0),

+                mPosition_local(0),

+                mVelocityJoint_local(0),

+                mPositionLastUpdate_local(0)

+        {

+                mJointState = new LLJointState;

+        }

+

+        BOOL initialize();

+

+        ~LLPhysicsMotion() {}

+

+        BOOL onUpdate(F32 time);

+

+        LLPointer<LLJointState> getJointState() 

+        {

+                return mJointState;

+        }

 protected:

-	F32 getParamValue(const std::string& controller_key)

-	{

-		const controller_map_t::const_iterator& entry = mParamControllers.find(controller_key);

-		if (entry == mParamControllers.end())

-		{

-			return sDefaultController[controller_key];

-		}

-		const std::string& param_name = (*entry).second.c_str();

-		return mCharacter->getVisualParamWeight(param_name.c_str());

-	}

-	void setParamValue(LLViewerVisualParam *param,

-			   const F32 new_value_local);

-

-	F32 toLocal(const LLVector3 &world);

-	F32 calculateVelocity_local(const F32 time_delta);

-	F32 calculateAcceleration_local(F32 velocity_local,

-					const F32 time_delta);

+        F32 getParamValue(const std::string& controller_key)

+        {

+                const controller_map_t::const_iterator& entry = mParamControllers.find(controller_key);

+                if (entry == mParamControllers.end())

+                {

+                        return sDefaultController[controller_key];

+                }

+                const std::string& param_name = (*entry).second.c_str();

+                return mCharacter->getVisualParamWeight(param_name.c_str());

+        }

+        void setParamValue(LLViewerVisualParam *param,

+                           const F32 new_value_local);

+

+        F32 toLocal(const LLVector3 &world);

+        F32 calculateVelocity_local(const F32 time_delta);

+        F32 calculateAcceleration_local(F32 velocity_local,

+                                        const F32 time_delta);

 private:

-	const std::string mParamDrivenName;

-	const std::string mParamUserName;

-	const LLVector3 mMotionDirectionVec;

-	const std::string mJointName;

-

-	F32 mPosition_local;

-	F32 mVelocityJoint_local; // How fast the joint is moving

-	F32 mAccelerationJoint_local; // Acceleration on the joint

-

-	F32 mVelocity_local; // How fast the param is moving

-	F32 mPositionLastUpdate_local;

-	LLVector3 mPosition_world;

-

-	LLViewerVisualParam *mParamUser;

-	LLViewerVisualParam *mParamDriven;

-	const controller_map_t mParamControllers;

-	

-	LLPointer<LLJointState> mJointState;

-	LLCharacter *mCharacter;

-

-	F32 mLastTime;

-	

-	static default_controller_map_t sDefaultController;

+        const std::string mParamDrivenName;

+        const std::string mParamUserName;

+        const LLVector3 mMotionDirectionVec;

+        const std::string mJointName;

+

+        F32 mPosition_local;

+        F32 mVelocityJoint_local; // How fast the joint is moving

+        F32 mAccelerationJoint_local; // Acceleration on the joint

+

+        F32 mVelocity_local; // How fast the param is moving

+        F32 mPositionLastUpdate_local;

+        LLVector3 mPosition_world;

+

+        LLViewerVisualParam *mParamUser;

+        LLViewerVisualParam *mParamDriven;

+        const controller_map_t mParamControllers;

+        

+        LLPointer<LLJointState> mJointState;

+        LLCharacter *mCharacter;

+

+        F32 mLastTime;

+        

+        static default_controller_map_t sDefaultController;

 };

 

 default_controller_map_t initDefaultController()

 {

-	default_controller_map_t controller;

-	controller["Mass"] = 0.2f;

-	controller["Smoothing"] = 2.0f;

-	controller["Gravity"] = 0.0f;

-	controller["Damping"] = .05f;

-	controller["Drag"] = 0.15f;

-	controller["MaxSpeed"] = 0.1f;

-	controller["Spring"] = 0.1f;

-	controller["Gain"] = 10.0f;

-	return controller;

+        default_controller_map_t controller;

+        controller["Mass"] = 0.2f;

+        controller["Smoothing"] = 2.0f;

+        controller["Gravity"] = 0.0f;

+        controller["Damping"] = .05f;

+        controller["Drag"] = 0.15f;

+        controller["MaxSpeed"] = 0.1f;

+        controller["Spring"] = 0.1f;

+        controller["Gain"] = 10.0f;

+        return controller;

 }

 

 default_controller_map_t LLPhysicsMotion::sDefaultController = initDefaultController();

 

 BOOL LLPhysicsMotion::initialize()

 {

-	if (!mJointState->setJoint(mCharacter->getJoint(mJointName.c_str())))

-		return FALSE;

-	mJointState->setUsage(LLJointState::ROT);

-

-	mParamUser = (LLViewerVisualParam*)mCharacter->getVisualParam(mParamUserName.c_str());

-	if (mParamDrivenName != "")

-		mParamDriven = (LLViewerVisualParam*)mCharacter->getVisualParam(mParamDrivenName.c_str());

-	if (mParamUser == NULL)

-	{

-		llinfos << "Failure reading in  [ " << mParamUserName << " ]" << llendl;

-		return FALSE;

-	}

-

-	return TRUE;

+        if (!mJointState->setJoint(mCharacter->getJoint(mJointName.c_str())))

+                return FALSE;

+        mJointState->setUsage(LLJointState::ROT);

+

+        mParamUser = (LLViewerVisualParam*)mCharacter->getVisualParam(mParamUserName.c_str());

+        if (mParamDrivenName != "")

+                mParamDriven = (LLViewerVisualParam*)mCharacter->getVisualParam(mParamDrivenName.c_str());

+        if (mParamUser == NULL)

+        {

+                llinfos << "Failure reading in  [ " << mParamUserName << " ]" << llendl;

+                return FALSE;

+        }

+

+        return TRUE;

 }

 

 LLPhysicsMotionController::LLPhysicsMotionController(const LLUUID &id) : 

-	LLMotion(id),

-	mCharacter(NULL)

+        LLMotion(id),

+        mCharacter(NULL)

 {

-	mName = "breast_motion";

+        mName = "breast_motion";

 }

 

 LLPhysicsMotionController::~LLPhysicsMotionController()

 {

-	for (motion_vec_t::iterator iter = mMotions.begin();

-	     iter != mMotions.end();

-	     ++iter)

-	{

-		delete (*iter);

-	}

+        for (motion_vec_t::iterator iter = mMotions.begin();

+             iter != mMotions.end();

+             ++iter)

+        {

+                delete (*iter);

+        }

 }

 

 BOOL LLPhysicsMotionController::onActivate() 

 { 

-	return TRUE; 

+        return TRUE; 

 }

 

 void LLPhysicsMotionController::onDeactivate() 

@@ -234,465 +234,465 @@ void LLPhysicsMotionController::onDeactivate()
 

 LLMotion::LLMotionInitStatus LLPhysicsMotionController::onInitialize(LLCharacter *character)

 {

-	mCharacter = character;

-

-	mMotions.clear();

-

-	// Breast Cleavage

-	{

-		controller_map_t controller;

-		controller["Mass"] = "Breast_Physics_Mass";

-		controller["Smoothing"] = "Breast_Physics_Smoothing";

-		controller["Gravity"] = "Breast_Physics_Gravity";

-		controller["Damping"] = "Breast_Physics_InOut_Damping";

-		controller["Drag"] = "Breast_Physics_InOut_Drag";

-		controller["MaxSpeed"] = "Breast_Physics_InOut_Max_Velocity";

-		controller["Spring"] = "Breast_Physics_InOut_Spring";

-		controller["Gain"] = "Breast_Physics_InOut_Gain";

-		LLPhysicsMotion *motion = new LLPhysicsMotion("Breast_Physics_InOut_Controller",

-													  "",

-													  "mChest",

-													  character,

-													  LLVector3(-1,0,0),

-													  controller);

-		if (!motion->initialize())

-		{

-			llassert_always(FALSE);

-			return STATUS_FAILURE;

-		}

-		addMotion(motion);

-	}

-

-	// Breast Bounce

-	{

-		controller_map_t controller;

-		controller["Mass"] = "Breast_Physics_Mass";

-		controller["Smoothing"] = "Breast_Physics_Smoothing";

-		controller["Gravity"] = "Breast_Physics_Gravity";

-		controller["Damping"] = "Breast_Physics_UpDown_Damping";

-		controller["Drag"] = "Breast_Physics_UpDown_Drag";

-		controller["MaxSpeed"] = "Breast_Physics_UpDown_Max_Velocity";

-		controller["Spring"] = "Breast_Physics_UpDown_Spring";

-		controller["Gain"] = "Breast_Physics_UpDown_Gain";

-		LLPhysicsMotion *motion = new LLPhysicsMotion("Breast_Physics_UpDown_Controller",

-													  "",

-													  "mChest",

-													  character,

-													  LLVector3(0,0,1),

-													  controller);

-		if (!motion->initialize())

-		{

-			llassert_always(FALSE);

-			return STATUS_FAILURE;

-		}

-		addMotion(motion);

-	}

-	

-	// Butt Bounce

-	{

-		controller_map_t controller;

-		controller["Mass"] = "Butt_Physics_Mass";

-		controller["Smoothing"] = "Butt_Physics_Smoothing";

-		controller["Gravity"] = "Butt_Physics_Gravity";

-		controller["Damping"] = "Butt_Physics_UpDown_Damping";

-		controller["Drag"] = "Butt_Physics_UpDown_Drag";

-		controller["MaxSpeed"] = "Butt_Physics_UpDown_Max_Velocity";

-		controller["Spring"] = "Butt_Physics_UpDown_Spring";

-		controller["Gain"] = "Butt_Physics_UpDown_Gain";

-		LLPhysicsMotion *motion = new LLPhysicsMotion("Butt_Physics_UpDown_Controller",

-													  "",

-													  "mPelvis",

-													  character,

-													  LLVector3(0,0,1),

-													  controller);

-		if (!motion->initialize())

-		{

-			llassert_always(FALSE);

-			return STATUS_FAILURE;

-		}

-		addMotion(motion);

-	}

-

-	// Butt LeftRight

-	{

-		controller_map_t controller;

-		controller["Mass"] = "Butt_Physics_Mass";

-		controller["Smoothing"] = "Butt_Physics_Smoothing";

-		controller["Gravity"] = "Butt_Physics_Gravity";

-		controller["Damping"] = "Butt_Physics_LeftRight_Damping";

-		controller["Drag"] = "Butt_Physics_LeftRight_Drag";

-		controller["MaxSpeed"] = "Butt_Physics_LeftRight_Max_Velocity";

-		controller["Spring"] = "Butt_Physics_LeftRight_Spring";

-		controller["Gain"] = "Butt_Physics_LeftRight_Gain";

-		LLPhysicsMotion *motion = new LLPhysicsMotion("Butt_Physics_LeftRight_Controller",

-													  "",

-													  "mPelvis",

-													  character,

-													  LLVector3(0,1,0),

-													  controller);

-		if (!motion->initialize())

-		{

-			llassert_always(FALSE);

-			return STATUS_FAILURE;

-		}

-		addMotion(motion);

-	}

-

-	// Belly Bounce

-	{

-		controller_map_t controller;

-		controller["Mass"] = "Belly_Physics_Mass";

-		controller["Smoothing"] = "Belly_Physics_Smoothing";

-		controller["Gravity"] = "Belly_Physics_Gravity";

-		controller["Damping"] = "Belly_Physics_UpDown_Damping";

-		controller["Drag"] = "Belly_Physics_UpDown_Drag";

-		controller["MaxSpeed"] = "Belly_Physics_UpDown_Max_Velocity";

-		controller["Spring"] = "Belly_Physics_UpDown_Spring";

-		controller["Gain"] = "Belly_Physics_UpDown_Gain";

-		LLPhysicsMotion *motion = new LLPhysicsMotion("Belly_Physics_UpDown_Controller",

-													  "",

-													  "mPelvis",

-													  character,

-													  LLVector3(0,0,-1),

-													  controller);

-		if (!motion->initialize())

-		{

-			llassert_always(FALSE);

-			return STATUS_FAILURE;

-		}

-		addMotion(motion);

-	}

-	

-	return STATUS_SUCCESS;

+        mCharacter = character;

+

+        mMotions.clear();

+

+        // Breast Cleavage

+        {

+                controller_map_t controller;

+                controller["Mass"] = "Breast_Physics_Mass";

+                controller["Smoothing"] = "Breast_Physics_Smoothing";

+                controller["Gravity"] = "Breast_Physics_Gravity";

+                controller["Drag"] = "Breast_Physics_Drag";

+                controller["Damping"] = "Breast_Physics_InOut_Damping";

+                controller["MaxSpeed"] = "Breast_Physics_InOut_Max_Velocity";

+                controller["Spring"] = "Breast_Physics_InOut_Spring";

+                controller["Gain"] = "Breast_Physics_InOut_Gain";

+                LLPhysicsMotion *motion = new LLPhysicsMotion("Breast_Physics_InOut_Controller",

+                                                                                                          "",

+                                                                                                          "mChest",

+                                                                                                          character,

+                                                                                                          LLVector3(-1,0,0),

+                                                                                                          controller);

+                if (!motion->initialize())

+                {

+                        llassert_always(FALSE);

+                        return STATUS_FAILURE;

+                }

+                addMotion(motion);

+        }

+

+        // Breast Bounce

+        {

+                controller_map_t controller;

+                controller["Mass"] = "Breast_Physics_Mass";

+                controller["Smoothing"] = "Breast_Physics_Smoothing";

+                controller["Gravity"] = "Breast_Physics_Gravity";

+                controller["Drag"] = "Breast_Physics_Drag";

+                controller["Damping"] = "Breast_Physics_UpDown_Damping";

+                controller["MaxSpeed"] = "Breast_Physics_UpDown_Max_Velocity";

+                controller["Spring"] = "Breast_Physics_UpDown_Spring";

+                controller["Gain"] = "Breast_Physics_UpDown_Gain";

+                LLPhysicsMotion *motion = new LLPhysicsMotion("Breast_Physics_UpDown_Controller",

+                                                                                                          "",

+                                                                                                          "mChest",

+                                                                                                          character,

+                                                                                                          LLVector3(0,0,1),

+                                                                                                          controller);

+                if (!motion->initialize())

+                {

+                        llassert_always(FALSE);

+                        return STATUS_FAILURE;

+                }

+                addMotion(motion);

+        }

+        

+        // Butt Bounce

+        {

+                controller_map_t controller;

+                controller["Mass"] = "Butt_Physics_Mass";

+                controller["Smoothing"] = "Butt_Physics_Smoothing";

+                controller["Gravity"] = "Butt_Physics_Gravity";

+                controller["Drag"] = "Butt_Physics_Drag";

+                controller["Damping"] = "Butt_Physics_UpDown_Damping";

+                controller["MaxSpeed"] = "Butt_Physics_UpDown_Max_Velocity";

+                controller["Spring"] = "Butt_Physics_UpDown_Spring";

+                controller["Gain"] = "Butt_Physics_UpDown_Gain";

+                LLPhysicsMotion *motion = new LLPhysicsMotion("Butt_Physics_UpDown_Controller",

+                                                                                                          "",

+                                                                                                          "mPelvis",

+                                                                                                          character,

+                                                                                                          LLVector3(0,0,1),

+                                                                                                          controller);

+                if (!motion->initialize())

+                {

+                        llassert_always(FALSE);

+                        return STATUS_FAILURE;

+                }

+                addMotion(motion);

+        }

+

+        // Butt LeftRight

+        {

+                controller_map_t controller;

+                controller["Mass"] = "Butt_Physics_Mass";

+                controller["Smoothing"] = "Butt_Physics_Smoothing";

+                controller["Gravity"] = "Butt_Physics_Gravity";

+                controller["Drag"] = "Butt_Physics_Drag";

+                controller["Damping"] = "Butt_Physics_LeftRight_Damping";

+                controller["MaxSpeed"] = "Butt_Physics_LeftRight_Max_Velocity";

+                controller["Spring"] = "Butt_Physics_LeftRight_Spring";

+                controller["Gain"] = "Butt_Physics_LeftRight_Gain";

+                LLPhysicsMotion *motion = new LLPhysicsMotion("Butt_Physics_LeftRight_Controller",

+                                                                                                          "",

+                                                                                                          "mPelvis",

+                                                                                                          character,

+                                                                                                          LLVector3(0,1,0),

+                                                                                                          controller);

+                if (!motion->initialize())

+                {

+                        llassert_always(FALSE);

+                        return STATUS_FAILURE;

+                }

+                addMotion(motion);

+        }

+

+        // Belly Bounce

+        {

+                controller_map_t controller;

+                controller["Mass"] = "Belly_Physics_Mass";

+                controller["Smoothing"] = "Belly_Physics_Smoothing";

+                controller["Gravity"] = "Belly_Physics_Gravity";

+                controller["Drag"] = "Belly_Physics_Drag";

+                controller["Damping"] = "Belly_Physics_UpDown_Damping";

+                controller["MaxSpeed"] = "Belly_Physics_UpDown_Max_Velocity";

+                controller["Spring"] = "Belly_Physics_UpDown_Spring";

+                controller["Gain"] = "Belly_Physics_UpDown_Gain";

+                LLPhysicsMotion *motion = new LLPhysicsMotion("Belly_Physics_UpDown_Controller",

+                                                                                                          "",

+                                                                                                          "mPelvis",

+                                                                                                          character,

+                                                                                                          LLVector3(0,0,-1),

+                                                                                                          controller);

+                if (!motion->initialize())

+                {

+                        llassert_always(FALSE);

+                        return STATUS_FAILURE;

+                }

+                addMotion(motion);

+        }

+        

+        return STATUS_SUCCESS;

 }

 

 void LLPhysicsMotionController::addMotion(LLPhysicsMotion *motion)

 {

-	addJointState(motion->getJointState());

-	mMotions.push_back(motion);

+        addJointState(motion->getJointState());

+        mMotions.push_back(motion);

 }

 

 F32 LLPhysicsMotionController::getMinPixelArea() 

 {

-	return MIN_REQUIRED_PIXEL_AREA_BREAST_MOTION;

+        return MIN_REQUIRED_PIXEL_AREA_BREAST_MOTION;

 }

 

 // Local space means "parameter space".

 F32 LLPhysicsMotion::toLocal(const LLVector3 &world)

 {

-	LLJoint *joint = mJointState->getJoint();

-	const LLQuaternion rotation_world = joint->getWorldRotation();

-	

-	LLVector3 dir_world = mMotionDirectionVec * rotation_world;

-	dir_world.normalize();

-	return world * dir_world;

+        LLJoint *joint = mJointState->getJoint();

+        const LLQuaternion rotation_world = joint->getWorldRotation();

+        

+        LLVector3 dir_world = mMotionDirectionVec * rotation_world;

+        dir_world.normalize();

+        return world * dir_world;

 }

 

 F32 LLPhysicsMotion::calculateVelocity_local(const F32 time_delta)

 {

-	LLJoint *joint = mJointState->getJoint();

-	const LLVector3 position_world = joint->getWorldPosition();

-	const LLQuaternion rotation_world = joint->getWorldRotation();

-	const LLVector3 last_position_world = mPosition_world;

-	const LLVector3 velocity_world = (position_world-last_position_world) / time_delta;

-	const F32 velocity_local = toLocal(velocity_world);

-	return velocity_local;

+        LLJoint *joint = mJointState->getJoint();

+        const LLVector3 position_world = joint->getWorldPosition();

+        const LLQuaternion rotation_world = joint->getWorldRotation();

+        const LLVector3 last_position_world = mPosition_world;

+        const LLVector3 velocity_world = (position_world-last_position_world) / time_delta;

+        const F32 velocity_local = toLocal(velocity_world);

+        return velocity_local;

 }

 

 F32 LLPhysicsMotion::calculateAcceleration_local(const F32 velocity_local,

-						 const F32 time_delta)

+                                                 const F32 time_delta)

 {

-	const F32 smoothing = getParamValue("Smoothing");

-	const F32 acceleration_local = velocity_local - mVelocityJoint_local;

-	

-	const F32 smoothed_acceleration_local = 

-		acceleration_local * 1.0/smoothing + 

-		mAccelerationJoint_local * (smoothing-1.0)/smoothing;

-	

-	return smoothed_acceleration_local;

+        const F32 smoothing = getParamValue("Smoothing");

+        const F32 acceleration_local = velocity_local - mVelocityJoint_local;

+        

+        const F32 smoothed_acceleration_local = 

+                acceleration_local * 1.0/smoothing + 

+                mAccelerationJoint_local * (smoothing-1.0)/smoothing;

+        

+        return smoothed_acceleration_local;

 }

 

 BOOL LLPhysicsMotionController::onUpdate(F32 time, U8* joint_mask)

 {

-	// Skip if disabled globally.

-	if (!gSavedSettings.getBOOL("AvatarPhysics"))

-	{

-		return TRUE;

-	}

-	

-	BOOL update_visuals = FALSE;

-	for (motion_vec_t::iterator iter = mMotions.begin();

-	     iter != mMotions.end();

-	     ++iter)

-	{

-		LLPhysicsMotion *motion = (*iter);

-		update_visuals |= motion->onUpdate(time);

-	}

-		

-	if (update_visuals)

-		mCharacter->updateVisualParams();

-	

-	return TRUE;

+        // Skip if disabled globally.

+        if (!gSavedSettings.getBOOL("AvatarPhysics"))

+        {

+                return TRUE;

+        }

+        

+        BOOL update_visuals = FALSE;

+        for (motion_vec_t::iterator iter = mMotions.begin();

+             iter != mMotions.end();

+             ++iter)

+        {

+                LLPhysicsMotion *motion = (*iter);

+                update_visuals |= motion->onUpdate(time);

+        }

+                

+        if (update_visuals)

+                mCharacter->updateVisualParams();

+        

+        return TRUE;

 }

 

 

 // Return TRUE if character has to update visual params.

 BOOL LLPhysicsMotion::onUpdate(F32 time)

 {

-	// static FILE *mFileWrite = fopen("c:\\temp\\avatar_data.txt","w");

-	

-	if (!mParamUser)

-		return FALSE;

-

-	if (!mLastTime)

-	{

-		mLastTime = time;

-		return FALSE;

-	}

-

-	////////////////////////////////////////////////////////////////////////////////

-	// Get all parameters and settings

-	//

-

-	const F32 time_delta = time - mLastTime;

-	if (time_delta > 3.0 || time_delta <= 0.01)

-	{

-		mLastTime = time;

-		return FALSE;

-	}

-

-	// Higher LOD is better.  This controls the granularity

-	// and frequency of updates for the motions.

-	const F32 lod_factor = LLVOAvatar::sPhysicsLODFactor;

-	if (lod_factor == 0)

-	{

-		return TRUE;

-	}

-

-	LLJoint *joint = mJointState->getJoint();

-

-	const F32 behavior_mass = getParamValue("Mass");

-	const F32 behavior_gravity = getParamValue("Gravity");

-	const F32 behavior_spring = getParamValue("Spring");

-	const F32 behavior_gain = getParamValue("Gain");

-	const F32 behavior_damping = getParamValue("Damping");

-	const F32 behavior_drag = getParamValue("Drag");

-	const BOOL physics_test = gSavedSettings.getBOOL("AvatarPhysicsTest");

-	

-	F32 behavior_maxspeed = getParamValue("MaxSpeed");

-	if (physics_test)

-		behavior_maxspeed = 100.0f;

-

-	if (behavior_maxspeed == 0)

-		return FALSE;

-

-	F32 position_current_local = llclamp(mPosition_local,

-					     0.0f,

-					     1.0f); // Normalized [0,1] range

-

-	// Normalize the param position to be from [0,1].

-	// We have to use normalized values because there may be more than one driven param,

-	// and each of these driven params may have its own range.

-	// This means we'll do all our calculations in normalized [0,1] local coordinates.

-	F32 position_user_local = mParamUser->getWeight();

-	position_user_local = (position_user_local - mParamUser->getMinWeight()) / (mParamUser->getMaxWeight() - mParamUser->getMinWeight());

-

-	//

-	// End parameters and settings

-	////////////////////////////////////////////////////////////////////////////////

-

-

-	////////////////////////////////////////////////////////////////////////////////

-	// Calculate velocity and acceleration in parameter space.

-	//

-	

-	const F32 velocity_joint_local = calculateVelocity_local(time_delta);

-	const F32 acceleration_joint_local = calculateAcceleration_local(velocity_joint_local, time_delta);

-

-	//

-	// End velocity and acceleration

-	////////////////////////////////////////////////////////////////////////////////

-

-

-	////////////////////////////////////////////////////////////////////////////////

-	// Calculate the total force 

-	//

-

-	// Spring force is a restoring force towards the original user-set breast position.

-	// F = kx

-	const F32 spring_length = position_current_local - position_user_local;

-	const F32 force_spring = -spring_length * behavior_spring;

-

-	// Acceleration is the force that comes from the change in velocity of the torso.

-	// F = ma

-	const F32 force_accel = behavior_gain * (acceleration_joint_local * behavior_mass);

-

-	// Gravity always points downward in world space.

-	// F = mg

-	const LLVector3 gravity_world(0,0,1);

-	const F32 force_gravity = behavior_gain * (toLocal(gravity_world) * behavior_gravity * behavior_mass);

-		

-	// Damping is a restoring force that opposes the current velocity.

-	// F = -kv

-	const F32 force_damping = -behavior_damping * mVelocity_local;

-		

-	// Drag is a force imparted by velocity (intuitively it is similar to wind resistance)

-	// F = .5kv^2

-	const F32 force_drag = .5*behavior_drag*velocity_joint_local*velocity_joint_local*llsgn(velocity_joint_local);

-

-	const F32 force_net = (force_accel + 

-			       force_gravity +

-			       force_spring + 

-			       force_damping + 

-			       force_drag);

-

-	//

-	// End total force

-	////////////////////////////////////////////////////////////////////////////////

-

-	

-	////////////////////////////////////////////////////////////////////////////////

-	// Calculate new params

-	//

-

-	// Calculate the new acceleration based on the net force.

-	// a = F/m

-	const F32 acceleration_new_local = force_net / behavior_mass;

-	F32 velocity_new_local = mVelocity_local + acceleration_new_local;

-	velocity_new_local = llclamp(velocity_new_local, 

-				     -behavior_maxspeed, behavior_maxspeed);

-	

-	// Temporary debugging setting to cause all avatars to move, for profiling purposes.

-	if (physics_test)

-	{

-		velocity_new_local = sin(time*4.0);

-	}

-	// Calculate the new parameters, or remain unchanged if max speed is 0.

-	const F32 position_new_local = (behavior_maxspeed != 0) ? 

-		(position_current_local + velocity_new_local*time_delta) :

-		position_user_local;

-

-	// Zero out the velocity if the param is being pushed beyond its limits.

-	if (position_new_local < 0 || position_new_local > 1)

-	{

-		velocity_new_local = 0;

-	}

-

-	const F32 position_new_local_clamped = llclamp(position_new_local,

-						       0.0f,

-						       1.0f);

-

-	// Set the new param.

-	// If a specific param has been declared, then set that one.

-	// Otherwise, assume that the param is a driver param, and

-	// set the params that it drives.

-	if (mParamDriven)

-	{

-		setParamValue(mParamDriven,position_new_local_clamped);

-	}

-	else

-	{

-		LLDriverParam *driver_param = dynamic_cast<LLDriverParam *>(mParamUser);

-		llassert_always(driver_param);

-		if (driver_param)

-		{

-			for (LLDriverParam::entry_list_t::iterator iter = driver_param->mDriven.begin();

-			     iter != driver_param->mDriven.end();

-			     ++iter)

-			{

-				LLDrivenEntry &entry = (*iter);

-				LLViewerVisualParam *driven_param = entry.mParam;

-				setParamValue(driven_param,position_new_local_clamped);

-			}

-		}

-	}

-	

-	//

-	// End calculate new params

-	////////////////////////////////////////////////////////////////////////////////

-	

-	////////////////////////////////////////////////////////////////////////////////

-	// Conditionally update the visual params

-	//

-	

-	// Updating the visual params (i.e. what the user sees) is fairly expensive.

-	// So only update if the params have changed enough, and also take into account

-	// the graphics LOD settings.

-	

-	BOOL update_visuals = FALSE;

-

-	// For non-self, if the avatar is small enough visually, then don't update.

-	const F32 area_for_max_settings = 0.0;

-	const F32 area_for_min_settings = 1400.0;

-	const F32 area_for_this_setting = area_for_max_settings + (area_for_min_settings-area_for_max_settings)*(1.0-lod_factor);

-	const F32 pixel_area = fsqrtf(mCharacter->getPixelArea());

-	

-	const BOOL is_self = (dynamic_cast<LLVOAvatarSelf *>(mCharacter) != NULL);

-	if ((pixel_area > area_for_this_setting) || is_self)

-	{

-		const F32 position_diff_local = llabs(mPositionLastUpdate_local-position_new_local_clamped);

-		const F32 min_delta = (1.01f-lod_factor)*0.4f;

-		if (llabs(position_diff_local) > min_delta)

-		{

-			update_visuals = TRUE;

-			mPositionLastUpdate_local = position_new_local;

-		}

-	}

-

-	//

-	// End update visual params

-	////////////////////////////////////////////////////////////////////////////////

-

-	mVelocityJoint_local = velocity_joint_local;

-

-	mVelocity_local = velocity_new_local;

-	mAccelerationJoint_local = acceleration_joint_local;

-	mPosition_local = position_new_local;

-

-	mPosition_world = joint->getWorldPosition();

-	mLastTime = time;

-

-	/*

-	  // Write out debugging info into a spreadsheet.

-	  if (mFileWrite != NULL && is_self)

-	  {

-	  fprintf(mFileWrite,"%f\t%f\t%f \t\t%f \t\t%f\t%f\t%f\t \t\t%f\t%f\t%f\t%f\t%f \t\t%f\t%f\t%f\n",

-	  position_new_local,

-	  velocity_new_local,

-	  acceleration_new_local,

-

-	  time_delta,

-

-	  mPosition_world[0],

-	  mPosition_world[1],

-	  mPosition_world[2],

-

-	  force_net,

-	  force_spring,

-	  force_accel,

-	  force_damping,

-	  force_drag,

-

-	  spring_length,

-	  velocity_joint_local,

-	  acceleration_joint_local

-	  );

-	  }

-	*/

-

-	return update_visuals;

+        // static FILE *mFileWrite = fopen("c:\\temp\\avatar_data.txt","w");

+        

+        if (!mParamUser)

+                return FALSE;

+

+        if (!mLastTime)

+        {

+                mLastTime = time;

+                return FALSE;

+        }

+

+        ////////////////////////////////////////////////////////////////////////////////

+        // Get all parameters and settings

+        //

+

+        const F32 time_delta = time - mLastTime;

+        if (time_delta > 3.0 || time_delta <= 0.01)

+        {

+                mLastTime = time;

+                return FALSE;

+        }

+

+        // Higher LOD is better.  This controls the granularity

+        // and frequency of updates for the motions.

+        const F32 lod_factor = LLVOAvatar::sPhysicsLODFactor;

+        if (lod_factor == 0)

+        {

+                return TRUE;

+        }

+

+        LLJoint *joint = mJointState->getJoint();

+

+        const F32 behavior_mass = getParamValue("Mass");

+        const F32 behavior_gravity = getParamValue("Gravity");

+        const F32 behavior_spring = getParamValue("Spring");

+        const F32 behavior_gain = getParamValue("Gain");

+        const F32 behavior_damping = getParamValue("Damping");

+        const F32 behavior_drag = getParamValue("Drag");

+        const BOOL physics_test = gSavedSettings.getBOOL("AvatarPhysicsTest");

+        

+        F32 behavior_maxspeed = getParamValue("MaxSpeed");

+        if (physics_test)

+                behavior_maxspeed = 100.0f;

+

+        if (behavior_maxspeed == 0)

+                return FALSE;

+

+        F32 position_current_local = llclamp(mPosition_local,

+                                             0.0f,

+                                             1.0f); // Normalized [0,1] range

+

+        // Normalize the param position to be from [0,1].

+        // We have to use normalized values because there may be more than one driven param,

+        // and each of these driven params may have its own range.

+        // This means we'll do all our calculations in normalized [0,1] local coordinates.

+        F32 position_user_local = mParamUser->getWeight();

+        position_user_local = (position_user_local - mParamUser->getMinWeight()) / (mParamUser->getMaxWeight() - mParamUser->getMinWeight());

+

+        //

+        // End parameters and settings

+        ////////////////////////////////////////////////////////////////////////////////

+

+

+        ////////////////////////////////////////////////////////////////////////////////

+        // Calculate velocity and acceleration in parameter space.

+        //

+        

+        const F32 velocity_joint_local = calculateVelocity_local(time_delta);

+        const F32 acceleration_joint_local = calculateAcceleration_local(velocity_joint_local, time_delta);

+

+        //

+        // End velocity and acceleration

+        ////////////////////////////////////////////////////////////////////////////////

+

+

+        ////////////////////////////////////////////////////////////////////////////////

+        // Calculate the total force 

+        //

+

+        // Spring force is a restoring force towards the original user-set breast position.

+        // F = kx

+        const F32 spring_length = position_current_local - position_user_local;

+        const F32 force_spring = -spring_length * behavior_spring;

+

+        // Acceleration is the force that comes from the change in velocity of the torso.

+        // F = ma

+        const F32 force_accel = behavior_gain * (acceleration_joint_local * behavior_mass);

+

+        // Gravity always points downward in world space.

+        // F = mg

+        const LLVector3 gravity_world(0,0,1);

+        const F32 force_gravity = behavior_gain * (toLocal(gravity_world) * behavior_gravity * behavior_mass);

+                

+        // Damping is a restoring force that opposes the current velocity.

+        // F = -kv

+        const F32 force_damping = -behavior_damping * mVelocity_local;

+                

+        // Drag is a force imparted by velocity (intuitively it is similar to wind resistance)

+        // F = .5kv^2

+        const F32 force_drag = .5*behavior_drag*velocity_joint_local*velocity_joint_local*llsgn(velocity_joint_local);

+

+        const F32 force_net = (force_accel + 

+                               force_gravity +

+                               force_spring + 

+                               force_damping + 

+                               force_drag);

+

+        //

+        // End total force

+        ////////////////////////////////////////////////////////////////////////////////

+

+        

+        ////////////////////////////////////////////////////////////////////////////////

+        // Calculate new params

+        //

+

+        // Calculate the new acceleration based on the net force.

+        // a = F/m

+        const F32 acceleration_new_local = force_net / behavior_mass;

+        F32 velocity_new_local = mVelocity_local + acceleration_new_local;

+        velocity_new_local = llclamp(velocity_new_local, 

+                                     -behavior_maxspeed, behavior_maxspeed);

+        

+        // Temporary debugging setting to cause all avatars to move, for profiling purposes.

+        if (physics_test)

+        {

+                velocity_new_local = sin(time*4.0);

+        }

+        // Calculate the new parameters, or remain unchanged if max speed is 0.

+        const F32 position_new_local = (behavior_maxspeed != 0) ? 

+                (position_current_local + velocity_new_local*time_delta) :

+                position_user_local;

+

+        // Zero out the velocity if the param is being pushed beyond its limits.

+        if (position_new_local < 0 || position_new_local > 1)

+        {

+                velocity_new_local = 0;

+        }

+

+        const F32 position_new_local_clamped = llclamp(position_new_local,

+                                                       0.0f,

+                                                       1.0f);

+

+        // Set the new param.

+        // If a specific param has been declared, then set that one.

+        // Otherwise, assume that the param is a driver param, and

+        // set the params that it drives.

+        if (mParamDriven)

+        {

+                setParamValue(mParamDriven,position_new_local_clamped);

+        }

+        else

+        {

+                LLDriverParam *driver_param = dynamic_cast<LLDriverParam *>(mParamUser);

+                llassert_always(driver_param);

+                if (driver_param)

+                {

+                        for (LLDriverParam::entry_list_t::iterator iter = driver_param->mDriven.begin();

+                             iter != driver_param->mDriven.end();

+                             ++iter)

+                        {

+                                LLDrivenEntry &entry = (*iter);

+                                LLViewerVisualParam *driven_param = entry.mParam;

+                                setParamValue(driven_param,position_new_local_clamped);

+                        }

+                }

+        }

+        

+        //

+        // End calculate new params

+        ////////////////////////////////////////////////////////////////////////////////

+        

+        ////////////////////////////////////////////////////////////////////////////////

+        // Conditionally update the visual params

+        //

+        

+        // Updating the visual params (i.e. what the user sees) is fairly expensive.

+        // So only update if the params have changed enough, and also take into account

+        // the graphics LOD settings.

+        

+        BOOL update_visuals = FALSE;

+

+        // For non-self, if the avatar is small enough visually, then don't update.

+        const F32 area_for_max_settings = 0.0;

+        const F32 area_for_min_settings = 1400.0;

+        const F32 area_for_this_setting = area_for_max_settings + (area_for_min_settings-area_for_max_settings)*(1.0-lod_factor);

+        const F32 pixel_area = fsqrtf(mCharacter->getPixelArea());

+        

+        const BOOL is_self = (dynamic_cast<LLVOAvatarSelf *>(mCharacter) != NULL);

+        if ((pixel_area > area_for_this_setting) || is_self)

+        {

+                const F32 position_diff_local = llabs(mPositionLastUpdate_local-position_new_local_clamped);

+                const F32 min_delta = (1.01f-lod_factor)*0.4f;

+                if (llabs(position_diff_local) > min_delta)

+                {

+                        update_visuals = TRUE;

+                        mPositionLastUpdate_local = position_new_local;

+                }

+        }

+

+        //

+        // End update visual params

+        ////////////////////////////////////////////////////////////////////////////////

+

+        mVelocityJoint_local = velocity_joint_local;

+

+        mVelocity_local = velocity_new_local;

+        mAccelerationJoint_local = acceleration_joint_local;

+        mPosition_local = position_new_local;

+

+        mPosition_world = joint->getWorldPosition();

+        mLastTime = time;

+

+        /*

+          // Write out debugging info into a spreadsheet.

+          if (mFileWrite != NULL && is_self)

+          {

+          fprintf(mFileWrite,"%f\t%f\t%f \t\t%f \t\t%f\t%f\t%f\t \t\t%f\t%f\t%f\t%f\t%f \t\t%f\t%f\t%f\n",

+          position_new_local,

+          velocity_new_local,

+          acceleration_new_local,

+

+          time_delta,

+

+          mPosition_world[0],

+          mPosition_world[1],

+          mPosition_world[2],

+

+          force_net,

+          force_spring,

+          force_accel,

+          force_damping,

+          force_drag,

+

+          spring_length,

+          velocity_joint_local,

+          acceleration_joint_local

+          );

+          }

+        */

+

+        return update_visuals;

 }

 

 // Range of new_value_local is assumed to be [0 , 1] normalized.

 void LLPhysicsMotion::setParamValue(LLViewerVisualParam *param,

-				    F32 new_value_normalized)

+                                    F32 new_value_normalized)

 {

-	const F32 value_min_local = param->getMinWeight();

-	const F32 value_max_local = param->getMaxWeight();

+        const F32 value_min_local = param->getMinWeight();

+        const F32 value_max_local = param->getMaxWeight();

 

-	const F32 new_value_local = value_min_local + (value_max_local-value_min_local) * new_value_normalized;

+        const F32 new_value_local = value_min_local + (value_max_local-value_min_local) * new_value_normalized;

 

-	mCharacter->setVisualParamWeight(param,

-					 new_value_local,

-					 FALSE);

+        mCharacter->setVisualParamWeight(param,

+                                         new_value_local,

+                                         FALSE);

 }

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 6f03606869..879ed2b505 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2514,44 +2514,42 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 <string name="Breast Physics Mass">Breast Mass</string>
 <string name="Breast Physics Smoothing">Breast Smoothing</string>
 <string name="Breast Physics Gravity">Breast Gravity</string>
+<string name="Breast Physics Drag">Breast Drag</string>
 
 <string name="Breast Physics InOut Max Speed">Max Effect</string>
 <string name="Breast Physics InOut Spring">Spring</string>
 <string name="Breast Physics InOut Gain">Gain</string>
 <string name="Breast Physics InOut Damping">Damping</string>
-<string name="Breast Physics InOut Drag">Breast Cleavage Drag</string>
 
 <string name="Breast Physics UpDown Max Speed">Max Effect</string>
 <string name="Breast Physics UpDown Spring">Spring</string>
 <string name="Breast Physics UpDown Gain">Gain</string>
 <string name="Breast Physics UpDown Damping">Damping</string>
-<string name="Breast Physics UpDown Drag">Breast Bounce Drag</string>
 
 <string name="Belly Physics Mass">Belly Mass</string>
 <string name="Belly Physics Smoothing">Belly Smoothing</string>
 <string name="Belly Physics Gravity">Belly Gravity</string>
+<string name="Belly Physics Drag">Belly Drag</string>
 
 <string name="Belly Physics UpDown Max Speed">Max Effect</string>
 <string name="Belly Physics UpDown Spring">Spring</string>
 <string name="Belly Physics UpDown Gain">Gain</string>
 <string name="Belly Physics UpDown Damping">Damping</string>
-<string name="Belly Physics UpDown Drag">Belly Bounce Drag</string>
 
 <string name="Butt Physics Mass">Butt Mass</string>
 <string name="Butt Physics Smoothing">Butt Smoothing</string>
 <string name="Butt Physics Gravity">Butt Gravity</string>
+<string name="Butt Physics Drag">Butt Drag</string>
 
 <string name="Butt Physics UpDown Max Speed">Max Effect</string>
 <string name="Butt Physics UpDown Spring">Spring</string>
 <string name="Butt Physics UpDown Gain">Gain</string>
 <string name="Butt Physics UpDown Damping">Damping</string>
-<string name="Butt Physics UpDown Drag">Butt Bounce Drag</string>
 
 <string name="Butt Physics LeftRight Max Speed">Max Effect</string>
 <string name="Butt Physics LeftRight Spring">Spring</string>
 <string name="Butt Physics LeftRight Gain">Gain</string>
 <string name="Butt Physics LeftRight Damping">Damping</string>
-<string name="Butt Physics LeftRight Drag">Butt Sway Drag</string>
 
 <string name="Bushy Eyebrows">Bushy Eyebrows</string>
 <string name="Bushy Hair">Bushy Hair</string>