From f2b65e07d0446e8db43b588a3c9e7fa93b7bcebe Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Fri, 18 Mar 2011 18:06:10 -0400
Subject: Took out unnecessary Butt Physics parameter.

---
 indra/newview/character/avatar_lad.xml | 23 +----------------------
 indra/newview/llpolymesh.cpp           |  2 +-
 2 files changed, 2 insertions(+), 23 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index 08102332d0..1c3f87373c 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -4443,7 +4443,7 @@
     <param
      id="1089"
      group="0"
-     name="Butt_Physics_UpDown_Driven"
+     name="Butt_Physics_UpDown_Controller"
      wearable="shape"
      edit_group="driven"
      label_min="Separate"
@@ -9394,27 +9394,6 @@ render_pass="bump">
 	</param_driver>
     </param>
 
-   <param
-     id="1090"
-     group="0"
-     name="Butt_Physics_UpDown_Controller"
-     label="Butt Physics UpDown Controller"
-     wearable="shape"
-     edit_group="shape_legs"
-     edit_group_order="7"
-     label_min="Less"
-     label_max="More"
-     value_default="0"
-     value_min="-2"
-     value_max="2"
-     camera_elevation=".3"
-     camera_distance=".8">
-      <param_driver>
-        <driven
-         id="1089" />
-	</param_driver>
-    </param>
-
     <param
      id="828"
      group="0"
diff --git a/indra/newview/llpolymesh.cpp b/indra/newview/llpolymesh.cpp
index b145b65bac..f287202ff1 100644
--- a/indra/newview/llpolymesh.cpp
+++ b/indra/newview/llpolymesh.cpp
@@ -651,7 +651,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const std::string& fileName )
 				if (!strcmp(morphName, "Small_Butt"))
 				{
 					LLPolyMorphData* cloned_morph_data = new LLPolyMorphData(*morph_data);
-					cloned_morph_data->mName = std::string("Butt_Physics_UpDown_Driven");
+					cloned_morph_data->mName = std::string("Butt_Physics_UpDown_Controller");
 					for (U32 v=0; v < cloned_morph_data->mNumIndices; v++)
 					{
 						cloned_morph_data->mCoords[v][0] = 0;
-- 
cgit v1.2.3