diff options
Diffstat (limited to 'OpenSim/Region')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 10 | ||||
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs | 9 |
3 files changed, 11 insertions, 10 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs index 159a3a8..7a791ec 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs | |||
@@ -65,7 +65,7 @@ public class BSActorSetTorque : BSActor | |||
65 | // BSActor.Refresh() | 65 | // BSActor.Refresh() |
66 | public override void Refresh() | 66 | public override void Refresh() |
67 | { | 67 | { |
68 | m_physicsScene.DetailLog("{0},BSActorSetTorque,refresh", m_controllingPrim.LocalID); | 68 | m_physicsScene.DetailLog("{0},BSActorSetTorque,refresh,torque={1}", m_controllingPrim.LocalID, m_controllingPrim.RawTorque); |
69 | 69 | ||
70 | // If not active any more, get rid of me (shouldn't ever happen, but just to be safe) | 70 | // If not active any more, get rid of me (shouldn't ever happen, but just to be safe) |
71 | if (m_controllingPrim.RawTorque == OMV.Vector3.Zero) | 71 | if (m_controllingPrim.RawTorque == OMV.Vector3.Zero) |
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs index 16c7a90..3423d2e 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |||
@@ -1514,16 +1514,8 @@ public class BSPrim : BSPhysObject | |||
1514 | LastEntityProperties = CurrentEntityProperties; | 1514 | LastEntityProperties = CurrentEntityProperties; |
1515 | CurrentEntityProperties = entprop; | 1515 | CurrentEntityProperties = entprop; |
1516 | 1516 | ||
1517 | // Note that BSPrim can be overloaded by BSPrimLinkable which controls updates from root and children prims. | ||
1517 | base.RequestPhysicsterseUpdate(); | 1518 | base.RequestPhysicsterseUpdate(); |
1518 | /* | ||
1519 | else | ||
1520 | { | ||
1521 | // For debugging, report the movement of children | ||
1522 | DetailLog("{0},BSPrim.UpdateProperties,child,pos={1},orient={2},vel={3},accel={4},rotVel={5}", | ||
1523 | LocalID, entprop.Position, entprop.Rotation, entprop.Velocity, | ||
1524 | entprop.Acceleration, entprop.RotationalVelocity); | ||
1525 | } | ||
1526 | */ | ||
1527 | } | 1519 | } |
1528 | } | 1520 | } |
1529 | } | 1521 | } |
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs index d65d407..28242d4 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs | |||
@@ -163,6 +163,15 @@ public class BSPrimLinkable : BSPrimDisplaced | |||
163 | // TODO: this will have to change when linksets are articulated. | 163 | // TODO: this will have to change when linksets are articulated. |
164 | base.UpdateProperties(entprop); | 164 | base.UpdateProperties(entprop); |
165 | } | 165 | } |
166 | /* | ||
167 | else | ||
168 | { | ||
169 | // For debugging, report the movement of children | ||
170 | DetailLog("{0},BSPrim.UpdateProperties,child,pos={1},orient={2},vel={3},accel={4},rotVel={5}", | ||
171 | LocalID, entprop.Position, entprop.Rotation, entprop.Velocity, | ||
172 | entprop.Acceleration, entprop.RotationalVelocity); | ||
173 | } | ||
174 | */ | ||
166 | // The linkset might like to know about changing locations | 175 | // The linkset might like to know about changing locations |
167 | Linkset.UpdateProperties(UpdatedProperties.EntPropUpdates, this); | 176 | Linkset.UpdateProperties(UpdatedProperties.EntPropUpdates, this); |
168 | } | 177 | } |