diff options
Merge branch 'master' into bulletsim
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index 4f461ad..0a0d13f 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 | } |