diff options
| author | Teravus Ovares (Dan Olivares) | 2009-12-05 13:01:21 -0500 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-12-05 13:01:21 -0500 |
| commit | c4b6010fb34268c9426f7241a38ba892b93780d1 (patch) | |
| tree | 52a5db76018dd820451121d66f8257cf154e1315 /OpenSim/Region/Physics/OdePlugin | |
| parent | Allow terrain heightmaps to be loaded directly from URIs via the remote admin... (diff) | |
| download | opensim-SC-c4b6010fb34268c9426f7241a38ba892b93780d1.zip opensim-SC-c4b6010fb34268c9426f7241a38ba892b93780d1.tar.gz opensim-SC-c4b6010fb34268c9426f7241a38ba892b93780d1.tar.bz2 opensim-SC-c4b6010fb34268c9426f7241a38ba892b93780d1.tar.xz | |
* Fixes mantis 4416. Animator is dereferenced on logout
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin')
| -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 1bc4a25..40fbde1 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
| @@ -1221,7 +1221,10 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1221 | { | 1221 | { |
| 1222 | if (m_eventsubscription > m_requestedUpdateFrequency) | 1222 | if (m_eventsubscription > m_requestedUpdateFrequency) |
| 1223 | { | 1223 | { |
| 1224 | base.SendCollisionUpdate(CollisionEventsThisFrame); | 1224 | if (CollisionEventsThisFrame != null) |
| 1225 | { | ||
| 1226 | base.SendCollisionUpdate(CollisionEventsThisFrame); | ||
| 1227 | } | ||
| 1225 | CollisionEventsThisFrame = new CollisionEventUpdate(); | 1228 | CollisionEventsThisFrame = new CollisionEventUpdate(); |
| 1226 | m_eventsubscription = 0; | 1229 | m_eventsubscription = 0; |
| 1227 | } | 1230 | } |