diff options
Diffstat (limited to 'OpenSim/Region/Physics/POSPlugin')
-rw-r--r-- | OpenSim/Region/Physics/POSPlugin/POSPlugin.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs b/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs index 1bc3490..74b319a 100644 --- a/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs +++ b/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs | |||
@@ -161,8 +161,13 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
161 | for (int i = 0; i < _prims.Count; ++i) | 161 | for (int i = 0; i < _prims.Count; ++i) |
162 | { | 162 | { |
163 | if (check_collision(c, _prims[i])) | 163 | if (check_collision(c, _prims[i])) |
164 | { | ||
165 | |||
164 | return true; | 166 | return true; |
167 | } | ||
168 | |||
165 | } | 169 | } |
170 | |||
166 | return false; | 171 | return false; |
167 | } | 172 | } |
168 | 173 | ||
@@ -282,10 +287,12 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
282 | { | 287 | { |
283 | character._velocity.Z = 0; | 288 | character._velocity.Z = 0; |
284 | character._target_velocity.Z = 0; | 289 | character._target_velocity.Z = 0; |
290 | ((PhysicsActor)character).IsColliding = true; | ||
285 | character.RequestPhysicsterseUpdate(); | 291 | character.RequestPhysicsterseUpdate(); |
286 | } | 292 | } |
287 | else | 293 | else |
288 | { | 294 | { |
295 | ((PhysicsActor)character).IsColliding = false; | ||
289 | character._velocity.Z = (character.Position.Z - oldposZ)/timeStep; | 296 | character._velocity.Z = (character.Position.Z - oldposZ)/timeStep; |
290 | } | 297 | } |
291 | } | 298 | } |