Increased butt physics range.

Added more logic to not center camera during edit physics mode.

indra/newview/llpolymesh.cpp

@@ -631,13 +631,13 @@ BOOL LLPolyMeshSharedData::loadMesh( const std::string& fileName )
 				if (!strcmp(morphName, "Small_Butt"))
 				{
 					mMorphData.insert(clone_morph_param(morph_data,
-									    LLVector3(0,0,0.01f),
+									    LLVector3(0,0,0.015f),
 									    "Butt_Physics_UpDown_Driven"));
 				}
 				if (!strcmp(morphName, "Small_Butt"))
 				{
 					mMorphData.insert(clone_morph_param(morph_data,
-									    LLVector3(0,0.01f,0),
+									    LLVector3(0,0.015f,0),
 									    "Butt_Physics_LeftRight_Driven"));
 				}
 			}

indra/newview/llsidepanelappearance.cpp

@@ -204,6 +204,8 @@ void LLSidepanelAppearance::updateToVisibility(const LLSD &new_visibility)
 				llwarns << "Visibility change to invalid wearable" << llendl;
 				return;
 			}
+			// Disable camera switch is currently just for WT_PHYSICS type since we don't want to freeze the avatar
+			// when editing its physics.
 			const BOOL disable_camera_motion = LLWearableType::getDisableCameraSwitch(wearable_ptr->getType());
 			if (!gAgentCamera.cameraCustomizeAvatar() && 
 				!disable_camera_motion &&
@@ -313,6 +315,15 @@ void LLSidepanelAppearance::showOutfitEditPanel()
 		mOutfitEdit->resetAccordionState();
 	}
 
+	// If we're exiting the edit wearable view, and the camera was not focused on the avatar
+	// (e.g. such as if we were editing a physics param), then skip the outfits edit mode since
+	// otherwise this would trigger the camera focus mode.
+	if (mEditWearable != NULL && mEditWearable->getVisible() && !gAgentCamera.cameraCustomizeAvatar())
+	{
+		showOutfitsInventoryPanel();
+		return;
+	}
+
 	toggleMyOutfitsPanel(FALSE);
 	toggleWearableEditPanel(FALSE, NULL, TRUE); // don't switch out of edit appearance mode
 	toggleOutfitEditPanel(TRUE);

indra/newview/skins/default/xui/en/panel_edit_physics.xml

@@ -27,8 +27,8 @@
         height ="300"
         layout="topleft"
         left="0"
-        name="wearable_accordion"
-        single_expansion="true"
+		single_expansion="true"
+        name="physics_accordion"
         top="0"
         width="313">
 		<accordion_tab