* Fixed Issue #161 by using PhysicsScene.Null instead of BasePhysicsScene

* Hid NullPhysicsScene for great justice
* Fixed broken Grid build

2 files changed, 38 insertions, 38 deletions

diff --git a/OpenSim/Region/Physics/Manager/PhysicsManager.cs b/OpenSim/Region/Physics/Manager/PhysicsManager.cs
index efccb36..0e28522 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsManager.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsManager.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Physics.Manager
                 {

             if (String.IsNullOrEmpty(engineName))

             {

-                return new NullPhysicsScene();

+                return PhysicsScene.Null;

             }

 

                         if(_plugins.ContainsKey(engineName))

diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 0901c2f..3f22585 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -53,61 +53,61 @@ namespace OpenSim.Physics.Manager
         public abstract void GetResults();

 

         public abstract void SetTerrain(float[] heightMap);

-        

+

         public abstract void DeleteTerrain();

 

         public abstract bool IsThreaded

         {

             get;

         }

-    }

 

-    public class NullPhysicsScene : PhysicsScene

-    {

-        private static int m_workIndicator;

-

-        public override PhysicsActor AddAvatar(PhysicsVector position)

+        private class NullPhysicsScene : PhysicsScene

         {

-            OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : AddAvatar({0})", position);

-            return PhysicsActor.Null;

-        }

+            private static int m_workIndicator;

 

-        public override void RemoveAvatar(PhysicsActor actor)

-        {

+            public override PhysicsActor AddAvatar(PhysicsVector position)

+            {

+                OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : AddAvatar({0})", position);

+                return PhysicsActor.Null;

+            }

 

-        }

+            public override void RemoveAvatar(PhysicsActor actor)

+            {

 

-        public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size)

-        {

-            OpenSim.Framework.Console.MainLog.Instance.Verbose( "NullPhysicsScene : AddPrim({0},{1})", position, size);

-            return PhysicsActor.Null;

-        }

+            }

 

-        public override void Simulate(float timeStep)

-        {

-            m_workIndicator = (m_workIndicator + 1) % 10;

+            public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size)

+            {

+                OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : AddPrim({0},{1})", position, size);

+                return PhysicsActor.Null;

+            }

 

-            //OpenSim.Framework.Console.MainLog.Instance.SetStatus(m_workIndicator.ToString());

-        }

+            public override void Simulate(float timeStep)

+            {

+                m_workIndicator = (m_workIndicator + 1) % 10;

 

-        public override void GetResults()

-        {

-            OpenSim.Framework.Console.MainLog.Instance.Verbose( "NullPhysicsScene : GetResults()");

-        }

+                //OpenSim.Framework.Console.MainLog.Instance.SetStatus(m_workIndicator.ToString());

+            }

 

-        public override void SetTerrain(float[] heightMap)

-        {

-            OpenSim.Framework.Console.MainLog.Instance.Verbose( "NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);

-        }

+            public override void GetResults()

+            {

+                OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : GetResults()");

+            }

 

-        public override void DeleteTerrain()

-        {

+            public override void SetTerrain(float[] heightMap)

+            {

+                OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);

+            }

 

-        }

+            public override void DeleteTerrain()

+            {

 

-        public override bool IsThreaded

-        {

-            get { return false; }

+            }

+

+            public override bool IsThreaded

+            {

+                get { return false; }

+            }

         }

     }

 }