diff options
| author | Melanie | 2009-12-05 19:53:54 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-05 19:53:54 +0000 |
| commit | 43a6fa1d01707fda74b8ba7c2d9fb95210463b6a (patch) | |
| tree | 77c5897901544e82467b1cdfafdc63644ee821ef /OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | * Fix line endings in BaseHttpServer.cs (diff) | |
| download | opensim-SC-43a6fa1d01707fda74b8ba7c2d9fb95210463b6a.zip opensim-SC-43a6fa1d01707fda74b8ba7c2d9fb95210463b6a.tar.gz opensim-SC-43a6fa1d01707fda74b8ba7c2d9fb95210463b6a.tar.bz2 opensim-SC-43a6fa1d01707fda74b8ba7c2d9fb95210463b6a.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODECharacter.cs')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index 905d3ba..b99baa2 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
| @@ -1243,7 +1243,10 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1243 | { | 1243 | { |
| 1244 | if (m_eventsubscription > m_requestedUpdateFrequency) | 1244 | if (m_eventsubscription > m_requestedUpdateFrequency) |
| 1245 | { | 1245 | { |
| 1246 | base.SendCollisionUpdate(CollisionEventsThisFrame); | 1246 | if (CollisionEventsThisFrame != null) |
| 1247 | { | ||
| 1248 | base.SendCollisionUpdate(CollisionEventsThisFrame); | ||
| 1249 | } | ||
| 1247 | CollisionEventsThisFrame = new CollisionEventUpdate(); | 1250 | CollisionEventsThisFrame = new CollisionEventUpdate(); |
| 1248 | m_eventsubscription = 0; | 1251 | m_eventsubscription = 0; |
| 1249 | } | 1252 | } |