diff options
author | idb | 2009-04-19 12:28:29 +0000 |
---|---|---|
committer | idb | 2009-04-19 12:28:29 +0000 |
commit | 716e1fe0e149129dad9fd05de3aee6f2de6e1dfe (patch) | |
tree | 647450aa3906592460197ad5a7344363d43d15ed | |
parent | * Rudimentary angular motor implementation for the LSL Vehicle API (diff) | |
download | opensim-SC-716e1fe0e149129dad9fd05de3aee6f2de6e1dfe.zip opensim-SC-716e1fe0e149129dad9fd05de3aee6f2de6e1dfe.tar.gz opensim-SC-716e1fe0e149129dad9fd05de3aee6f2de6e1dfe.tar.bz2 opensim-SC-716e1fe0e149129dad9fd05de3aee6f2de6e1dfe.tar.xz |
Keep IsColliding updated for the recent changes in ScenePresence so that walk/stand animations will get used instead of just falling
-rw-r--r-- | OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs index 284837b..e7902bf 100644 --- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs +++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs | |||
@@ -164,16 +164,19 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin | |||
164 | { | 164 | { |
165 | actor.Position.Z = height; | 165 | actor.Position.Z = height; |
166 | actor.Velocity.Z = 0; | 166 | actor.Velocity.Z = 0; |
167 | actor.IsColliding = true; | ||
167 | } | 168 | } |
168 | else | 169 | else |
169 | { | 170 | { |
170 | actor.Position.Z += actor.Velocity.Z*timeStep; | 171 | actor.Position.Z += actor.Velocity.Z*timeStep; |
172 | actor.IsColliding = false; | ||
171 | } | 173 | } |
172 | } | 174 | } |
173 | else | 175 | else |
174 | { | 176 | { |
175 | actor.Position.Z = height; | 177 | actor.Position.Z = height; |
176 | actor.Velocity.Z = 0; | 178 | actor.Velocity.Z = 0; |
179 | actor.IsColliding = true; | ||
177 | } | 180 | } |
178 | } | 181 | } |
179 | return fps; | 182 | return fps; |