aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-25 22:46:42 +0100
committerJustin Clark-Casey (justincc)2011-10-25 22:46:42 +0100
commit6a74a4c12b769742f9e6ee328fd7557faa826e50 (patch)
tree05f8d4885e7eca7f98c1c63ffdddee5bb594c0f0 /OpenSim
parentRemove unused fields from CollisionEventUpdate (diff)
downloadopensim-SC-6a74a4c12b769742f9e6ee328fd7557faa826e50.zip
opensim-SC-6a74a4c12b769742f9e6ee328fd7557faa826e50.tar.gz
opensim-SC-6a74a4c12b769742f9e6ee328fd7557faa826e50.tar.bz2
opensim-SC-6a74a4c12b769742f9e6ee328fd7557faa826e50.tar.xz
Clear OdeCharacter CollisionEventUpdate when we subscribe or unsubscribe from collision events
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index b6e1c4e..c22d27f 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -1210,11 +1210,13 @@ namespace OpenSim.Region.Physics.OdePlugin
1210 { 1210 {
1211 m_requestedUpdateFrequency = ms; 1211 m_requestedUpdateFrequency = ms;
1212 m_eventsubscription = ms; 1212 m_eventsubscription = ms;
1213 CollisionEventsThisFrame.Clear();
1213 _parent_scene.AddCollisionEventReporting(this); 1214 _parent_scene.AddCollisionEventReporting(this);
1214 } 1215 }
1215 1216
1216 public override void UnSubscribeEvents() 1217 public override void UnSubscribeEvents()
1217 { 1218 {
1219 CollisionEventsThisFrame.Clear();
1218 _parent_scene.RemoveCollisionEventReporting(this); 1220 _parent_scene.RemoveCollisionEventReporting(this);
1219 m_requestedUpdateFrequency = 0; 1221 m_requestedUpdateFrequency = 0;
1220 m_eventsubscription = 0; 1222 m_eventsubscription = 0;