diff options
| author | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-07-09 17:47:58 -0700 |
|---|---|---|
| committer | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-07-09 17:47:58 -0700 |
| commit | 3733337011c781b6dabe978181d8ae4c5c96188b (patch) | |
| tree | 91cda565eda0dd492ce2709ce454b7f9dfa74542 /indra/newview/llselectmgr.cpp | |
| parent | 2530b057bb18550ed2825c14988a807ab90d460f (diff) | |
Gravity, Friction, Restitution, Density now work with simulator.
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
| -rw-r--r-- | indra/newview/llselectmgr.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 8ab9910f67..c11a6f289b 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -3939,18 +3939,16 @@ void LLSelectMgr::selectionUpdateCastShadows(BOOL cast_shadows) struct LLSelectMgrApplyPhysicsParam : public LLSelectedObjectFunctor { - LLSelectMgrApplyPhysicsParam(U8 type, F32 gravity, BOOL material_override, - F32 friction, F32 density, F32 restitution) : + LLSelectMgrApplyPhysicsParam(U8 type, F32 gravity, F32 friction, + F32 density, F32 restitution) : mType(type), mGravity(gravity), - mMaterialOverride(material_override), mFriction(friction), mDensity(density), mRestitution(restitution) {} U8 mType; F32 mGravity; - BOOL mMaterialOverride; F32 mFriction; F32 mDensity; F32 mRestitution; @@ -3960,7 +3958,6 @@ struct LLSelectMgrApplyPhysicsParam : public LLSelectedObjectFunctor { object->setPhysicsShapeType( mType ); object->setPhysicsGravity(mGravity); - object->setPhysicsMaterialOverride(mMaterialOverride); object->setPhysicsFriction(mFriction); object->setPhysicsDensity(mDensity); object->setPhysicsRestitution(mRestitution); @@ -3971,11 +3968,11 @@ struct LLSelectMgrApplyPhysicsParam : public LLSelectedObjectFunctor }; -void LLSelectMgr::selectionUpdatePhysicsParam(U8 type, F32 gravity, BOOL material_override, - F32 friction, F32 density, F32 restitution) +void LLSelectMgr::selectionUpdatePhysicsParam(U8 type, F32 gravity, F32 friction, + F32 density, F32 restitution) { llwarns << "physics shape type ->" << (U32)type << llendl; - LLSelectMgrApplyPhysicsParam func(type, gravity, material_override, friction, density, restitution); + LLSelectMgrApplyPhysicsParam func(type, gravity, friction, density, restitution); getSelection()->applyToObjects(&func); } |