From eacc2561d14dbe9cba6966e3b32bfd776e044f8a Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 10 Jan 2013 17:03:19 -0800
Subject: BulletSim: add osGetPhysicsEngineType() LSL function and update the
 physics engines to return the name that is specified in the INI file
 ("physics = XXX") as the type of engine. This os function is a little
 different than the others in that it does not throw an exception of one is
 not privilaged to use it. It merely returns an empty string.

---
 OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs | 2 +-
 OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Physics/BasicPhysicsPlugin')

diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
index 7ab2a03..373c7e0 100644
--- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
 
         public PhysicsScene GetScene(string sceneIdentifier)
         {
-            return new BasicScene(sceneIdentifier);
+            return new BasicScene(GetName(), sceneIdentifier);
         }
 
         public string GetName()
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs
index f5826ed..c4b9117 100644
--- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs
@@ -49,8 +49,10 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
 
         //protected internal string sceneIdentifier;
 
-        public BasicScene(string _sceneIdentifier)
+        public BasicScene(string engineType, string _sceneIdentifier)
         {
+            EngineType = engineType;
+            Name = EngineType + "/" + _sceneIdentifier;
             //sceneIdentifier = _sceneIdentifier;
         }
 
-- 
cgit v1.1


From 1f1da230976451d30d920c237d53c699ba96b9d9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 5 Feb 2013 00:23:17 +0000
Subject: Bump version and assembly version numbers from 0.7.5 to 0.7.6

This is mostly Bluewall's work but I am also bumping the general version number
OpenSimulator 0.7.5 remains in the release candidate stage.
I'm doing this because master is significantly adding things that will not be in 0.7.5
This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names
and so the exact version match requirement is not in force.
---
 OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Physics/BasicPhysicsPlugin')

diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs
index fb9cb66..6fd6f7e 100644
--- a/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs
@@ -55,4 +55,4 @@ using System.Runtime.InteropServices;
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
 
-[assembly : AssemblyVersion("0.7.5.*")]
+[assembly : AssemblyVersion("0.7.6.*")]
-- 
cgit v1.1


From 8960418e7d51a0f861e7b4cb800f007d76862c9c Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 6 Mar 2013 21:37:53 +0000
Subject: Add regression test for presence crossing between regions on the same
 simulator.

Unlike a much earlier commented out version of this test, this is done in synchronous mode.
---
 OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Physics/BasicPhysicsPlugin')

diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs
index c4b9117..0816b7b 100644
--- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs
@@ -102,6 +102,8 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
 
         public override float Simulate(float timeStep)
         {
+//            Console.WriteLine("Simulating");
+
             float fps = 0;
             for (int i = 0; i < _actors.Count; ++i)
             {
@@ -109,8 +111,11 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
                 Vector3 actorPosition = actor.Position;
                 Vector3 actorVelocity = actor.Velocity;
 
-                actorPosition.X += actor.Velocity.X*timeStep;
-                actorPosition.Y += actor.Velocity.Y*timeStep;
+//                Console.WriteLine(
+//                    "Processing actor {0}, starting pos {1}, starting vel {2}", i, actorPosition, actorVelocity);
+
+                actorPosition.X += actor.Velocity.X * timeStep;
+                actorPosition.Y += actor.Velocity.Y * timeStep;
 
                 if (actor.Position.Y < 0)
                 {
-- 
cgit v1.1