Merge branch 'SledjChisl'

1 files changed, 8 insertions, 2 deletions

diff --git a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs
index 20b337a..29685da 100644
--- a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs
+++ b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs
@@ -61,6 +61,11 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics
             get { return "basicphysics"; }
         }
 
+        public string Version
+        {
+            get { return "1.0"; }
+        }
+
         public Type ReplaceableInterface
         {
             get { return null; }
@@ -90,6 +95,7 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics
 
             EngineType = Name;
             PhysicsSceneName = EngineType + "/" + scene.RegionInfo.RegionName;
+            EngineName = Name + " " + Version;
 
             scene.RegisterModuleInterface<PhysicsScene>(this);
             m_regionExtent = new Vector3(scene.RegionInfo.RegionSizeX, scene.RegionInfo.RegionSizeY, scene.RegionInfo.RegionSizeZ);
@@ -157,7 +163,7 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics
         {
 //            Console.WriteLine("Simulating");
 
-            float fps = 0;
+//            float fps = 0;
             for (int i = 0; i < _actors.Count; ++i)
             {
                 BasicActor actor = _actors[i];
@@ -220,7 +226,7 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics
                 actor.Velocity = actorVelocity;
             }
 
-            return fps;
+            return 1.0f;
         }
 
         public override void GetResults()