diff options
author | Justin Clark-Casey (justincc) | 2011-07-30 03:56:29 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-07-30 03:56:29 +0100 |
commit | 49a3740ee9983ffa99a81924aa01071f4dc13a6b (patch) | |
tree | cf68a42cd8c7e43505c7723e652744e101d7b252 /OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |
parent | minor: remove some mono compiler warnings (diff) | |
download | opensim-SC-49a3740ee9983ffa99a81924aa01071f4dc13a6b.zip opensim-SC-49a3740ee9983ffa99a81924aa01071f4dc13a6b.tar.gz opensim-SC-49a3740ee9983ffa99a81924aa01071f4dc13a6b.tar.bz2 opensim-SC-49a3740ee9983ffa99a81924aa01071f4dc13a6b.tar.xz |
minor: remove mono compiler warnings, some code spacing adjustments
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 34c0deb..44eafb7 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -1457,7 +1457,6 @@ Console.WriteLine("changeadd 1"); | |||
1457 | { | 1457 | { |
1458 | if (m_isphysical) | 1458 | if (m_isphysical) |
1459 | { | 1459 | { |
1460 | |||
1461 | if (!m_disabled && !m_taintremove && !childPrim) | 1460 | if (!m_disabled && !m_taintremove && !childPrim) |
1462 | { | 1461 | { |
1463 | if (Body == IntPtr.Zero) | 1462 | if (Body == IntPtr.Zero) |
@@ -2999,6 +2998,7 @@ Console.WriteLine("changeshape not need meshing"); | |||
2999 | { | 2998 | { |
3000 | if (CollisionEventsThisFrame == null) | 2999 | if (CollisionEventsThisFrame == null) |
3001 | CollisionEventsThisFrame = new CollisionEventUpdate(); | 3000 | CollisionEventsThisFrame = new CollisionEventUpdate(); |
3001 | |||
3002 | CollisionEventsThisFrame.addCollider(CollidedWith, contact); | 3002 | CollisionEventsThisFrame.addCollider(CollidedWith, contact); |
3003 | } | 3003 | } |
3004 | 3004 | ||