aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs18
1 files changed, 15 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 0e7dd81..c165a41 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -258,7 +258,11 @@ namespace OpenSim.Region.Physics.OdePlugin
258 public override bool Flying 258 public override bool Flying
259 { 259 {
260 get { return flying; } 260 get { return flying; }
261 set { flying = value; } 261 set
262 {
263 flying = value;
264// m_log.DebugFormat("[PHYSICS]: Set OdeCharacter Flying to {0}", flying);
265 }
262 } 266 }
263 267
264 /// <summary> 268 /// <summary>
@@ -305,10 +309,12 @@ namespace OpenSim.Region.Physics.OdePlugin
305 { 309 {
306 m_iscolliding = true; 310 m_iscolliding = true;
307 } 311 }
312
308 if (m_wascolliding != m_iscolliding) 313 if (m_wascolliding != m_iscolliding)
309 { 314 {
310 //base.SendCollisionUpdate(new CollisionEventUpdate()); 315 //base.SendCollisionUpdate(new CollisionEventUpdate());
311 } 316 }
317
312 m_wascolliding = m_iscolliding; 318 m_wascolliding = m_iscolliding;
313 } 319 }
314 } 320 }
@@ -1219,18 +1225,23 @@ namespace OpenSim.Region.Physics.OdePlugin
1219 { 1225 {
1220 m_requestedUpdateFrequency = ms; 1226 m_requestedUpdateFrequency = ms;
1221 m_eventsubscription = ms; 1227 m_eventsubscription = ms;
1222 _parent_scene.addCollisionEventReporting(this); 1228 _parent_scene.AddCollisionEventReporting(this);
1223 } 1229 }
1230
1224 public override void UnSubscribeEvents() 1231 public override void UnSubscribeEvents()
1225 { 1232 {
1226 _parent_scene.remCollisionEventReporting(this); 1233 _parent_scene.RemoveCollisionEventReporting(this);
1227 m_requestedUpdateFrequency = 0; 1234 m_requestedUpdateFrequency = 0;
1228 m_eventsubscription = 0; 1235 m_eventsubscription = 0;
1229 } 1236 }
1237
1230 public void AddCollisionEvent(uint CollidedWith, ContactPoint contact) 1238 public void AddCollisionEvent(uint CollidedWith, ContactPoint contact)
1231 { 1239 {
1232 if (m_eventsubscription > 0) 1240 if (m_eventsubscription > 0)
1233 { 1241 {
1242// m_log.DebugFormat(
1243// "[PHYSICS]: Adding collision event for {0}, collidedWith {1}, contact {2}", "", CollidedWith, contact);
1244
1234 CollisionEventsThisFrame.addCollider(CollidedWith, contact); 1245 CollisionEventsThisFrame.addCollider(CollidedWith, contact);
1235 } 1246 }
1236 } 1247 }
@@ -1247,6 +1258,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1247 m_eventsubscription = 0; 1258 m_eventsubscription = 0;
1248 } 1259 }
1249 } 1260 }
1261
1250 public override bool SubscribedEvents() 1262 public override bool SubscribedEvents()
1251 { 1263 {
1252 if (m_eventsubscription > 0) 1264 if (m_eventsubscription > 0)