diff options
| author | Seraph Linden <none@none> | 2011-04-03 18:09:38 -0400 |
|---|---|---|
| committer | Seraph Linden <none@none> | 2011-04-03 18:09:38 -0400 |
| commit | 01c236df47c2bc48af26e96d2a7bde8d32cf3514 (patch) | |
| tree | 60a5d9e6591574fa08ffc0a45c939c986f077287 /indra/newview | |
| parent | 05e23c39f731ed50663d3dd3f8fa442d95161241 (diff) | |
Fix for butt gravity direction.
Added more displacement range for butt leftright.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llphysicsmotion.cpp | 22 | ||||
| -rw-r--r-- | indra/newview/llpolymesh.cpp | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/indra/newview/llphysicsmotion.cpp b/indra/newview/llphysicsmotion.cpp index 8f747af824..eab66749d0 100644 --- a/indra/newview/llphysicsmotion.cpp +++ b/indra/newview/llphysicsmotion.cpp @@ -346,7 +346,7 @@ LLMotion::LLMotionInitStatus LLPhysicsMotionController::onInitialize(LLCharacter "",
"mPelvis",
character,
- LLVector3(0,1,0),
+ LLVector3(0,-1,0),
controller);
if (!motion->initialize())
{
@@ -420,7 +420,7 @@ F32 LLPhysicsMotion::calculateAcceleration_local(const F32 velocity_local, const F32 time_delta)
{
// const F32 smoothing = getParamValue("Smoothing");
- static const F32 smoothing = 3.0f; // Removed smoothing param since it's probably not necessary
+ static const F32 smoothing = 3.0f; // Removed smoothing param since it's probably not necessary
const F32 acceleration_local = velocity_local - mVelocityJoint_local;
const F32 smoothed_acceleration_local =
@@ -624,15 +624,15 @@ BOOL LLPhysicsMotion::onUpdate(F32 time) llassert_always(driver_param);
if (driver_param)
{
- // If this is one of our "hidden" driver params, then make sure it's
- // the default value.
- if ((driver_param->getGroup() != VISUAL_PARAM_GROUP_TWEAKABLE) &&
- (driver_param->getGroup() != VISUAL_PARAM_GROUP_TWEAKABLE_NO_TRANSMIT))
- {
- mCharacter->setVisualParamWeight(driver_param,
- 0,
- FALSE);
- }
+ // If this is one of our "hidden" driver params, then make sure it's
+ // the default value.
+ if ((driver_param->getGroup() != VISUAL_PARAM_GROUP_TWEAKABLE) &&
+ (driver_param->getGroup() != VISUAL_PARAM_GROUP_TWEAKABLE_NO_TRANSMIT))
+ {
+ mCharacter->setVisualParamWeight(driver_param,
+ 0,
+ FALSE);
+ }
for (LLDriverParam::entry_list_t::iterator iter = driver_param->mDriven.begin();
iter != driver_param->mDriven.end();
++iter)
diff --git a/indra/newview/llpolymesh.cpp b/indra/newview/llpolymesh.cpp index 7a2ecffb34..f0910d404a 100644 --- a/indra/newview/llpolymesh.cpp +++ b/indra/newview/llpolymesh.cpp @@ -647,7 +647,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const std::string& fileName ) if (!strcmp(morphName, "Small_Butt")) { mMorphData.insert(clone_morph_param(morph_data, - LLVector3(0,0.02f,0), + LLVector3(0,0.03f,0), "Butt_Physics_LeftRight_Driven")); } } |