minor: remove mono compiler warnings, some code spacing adjustments

3 files changed, 8 insertions, 7 deletions

diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 7766691..4f461ad 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -1229,11 +1229,14 @@ namespace OpenSim.Region.Physics.OdePlugin
             m_requestedUpdateFrequency = 0;
             m_eventsubscription = 0;
         }
-        
+
         public void AddCollisionEvent(uint CollidedWith, ContactPoint contact)
         {
             if (m_eventsubscription > 0)
             {
+//                m_log.DebugFormat(
+//                    "[PHYSICS]: Adding collision event for {0}, collidedWith {1}, contact {2}", "", CollidedWith, contact);
+
                 CollisionEventsThisFrame.addCollider(CollidedWith, contact);
             }
         }
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");
         {
             if (m_isphysical)
             {
-                
                 if (!m_disabled && !m_taintremove && !childPrim)
                 {
                     if (Body == IntPtr.Zero)
@@ -2999,6 +2998,7 @@ Console.WriteLine("changeshape not need meshing");
         {
             if (CollisionEventsThisFrame == null)
                 CollisionEventsThisFrame = new CollisionEventUpdate();
+
             CollisionEventsThisFrame.addCollider(CollidedWith, contact);
         }
 
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
index e1e031f..8a24190 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
@@ -100,7 +100,7 @@ namespace OpenSim.Region.Physics.OdePlugin
         Rubber = 6
     }
 
-    public sealed class OdeScene : PhysicsScene
+    public class OdeScene : PhysicsScene
     {
         private readonly ILog m_log;
         // private Dictionary<string, sCollisionData> m_storedCollisions = new Dictionary<string, sCollisionData>();
@@ -957,7 +957,6 @@ namespace OpenSim.Region.Physics.OdePlugin
                                     character.SetPidStatus(true);
                                 }
                             }
-                            
 
                             if (p1.PhysicsActorType == (int) ActorTypes.Agent)
                             {
@@ -1058,9 +1057,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                                     {
                                         joint = d.JointCreateContact(world, contactgroup, ref m_materialContacts[material, movintYN]);
                                         m_global_contactcount++;
-
                                     }
-                                    
                                 }
                                 else
                                 {
@@ -1083,7 +1080,6 @@ namespace OpenSim.Region.Physics.OdePlugin
                                     {
                                         joint = d.JointCreateContact(world, contactgroup, ref m_materialContacts[material, movintYN]);
                                         m_global_contactcount++;
-
                                     }
                                 }
                             }
@@ -1295,6 +1291,7 @@ namespace OpenSim.Region.Physics.OdePlugin
 
                             //returncollisions = true;
                             break;
+
                         case ActorTypes.Prim:
                             if (p1 is OdePrim)
                             {
@@ -1322,6 +1319,7 @@ namespace OpenSim.Region.Physics.OdePlugin
 
                     cc2.AddCollisionEvent(obj2LocalID, contact);
                     break;
+
                 case ActorTypes.Prim:
 
                     if (p2 is OdePrim)