diff --git a/OpenSim.sln b/OpenSim.sln
index 66e79d22bb..bd39235ca3 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C# Express 2005
+# Visual Studio 2005
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\Region\Application\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim\Framework\General\OpenSim.Framework.csproj", "{8ACA2445-0000-0000-0000-000000000000}"
diff --git a/OpenSim/Grid/AssetServer/AssetHttpServer.cs b/OpenSim/Grid/AssetServer/AssetHttpServer.cs
index ad8733f9e4..31cb3797fa 100644
--- a/OpenSim/Grid/AssetServer/AssetHttpServer.cs
+++ b/OpenSim/Grid/AssetServer/AssetHttpServer.cs
@@ -94,7 +94,7 @@ namespace OpenSim.Grid.AssetServer
 
                     case "application/xml":
                         // probably LLSD we hope, otherwise it should be ignored by the parser
-                        responseString = ParseLLSDXML(requestBody);
+                        responseString = ParseREST(requestBody, request.RawUrl, request.HttpMethod);
                         response.AddHeader("Content-type", "application/xml");
                         break;
 
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index 8e9ad75822..3d9dd0d0a2 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -14,9 +14,9 @@ using OpenSim.Region.Caches;
 using OpenSim.Framework.Communications;
 using OpenSim.Region.Communications.Local;
 using OpenSim.Region.ClientStack;
-using OpenSim.Region.Physics.BasicPhysicsPlugin;
 using System.Net;
 using libsecondlife.Packets;
+using OpenSim.Physics.Manager;
 
 namespace SimpleApp
 {
@@ -59,7 +59,7 @@ namespace SimpleApp
 
             BaseHttpServer httpServer = new BaseHttpServer( internalEndPoint.Port );
             MyWorld world = new MyWorld(packetServer.ClientAPIs, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer);
-            world.PhysScene = new BasicScene();
+            world.PhysScene = PhysicsScene.Null;
             udpServer.LocalWorld = world;
 
             httpServer.AddXmlRPCHandler("login_to_simulator", communicationsManager.UserServices.XmlRpcLoginMethod );
diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
index d39d0913d8..bb8dcc021d 100644
--- a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
+++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
@@ -140,12 +140,6 @@
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
 			<Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\Physics\BasicPhysicsPlugin\OpenSim.Region.Physics.BasicPhysicsPlugin.csproj">
-      <Name>OpenSim.Region.Physics.BasicPhysicsPlugin</Name>
-      <Project>{15B4FEF3-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj">
       <Name>OpenSim.Region.Physics.Manager</Name>
       <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
index db44992a8d..aab0826aaa 100644
--- a/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
+++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
@@ -31,7 +31,6 @@
                 <include name="../../../../bin/OpenSim.Region.Communications.Local.dll" />
                 <include name="../../../../bin/OpenSim.Region.Environment.dll" />
                 <include name="../../../../bin/OpenSim.Region.GridInterfaces.Local.dll" />
-                <include name="../../../../bin/OpenSim.Region.Physics.BasicPhysicsPlugin.dll" />
                 <include name="../../../../bin/OpenSim.Region.Physics.Manager.dll" />
                 <include name="System.dll" />
                 <include name="System.Data.dll.dll" />
diff --git a/OpenSim/Region/Physics/Manager/PhysicsManager.cs b/OpenSim/Region/Physics/Manager/PhysicsManager.cs
index efccb36791..0e2852235e 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 0901c2f30c..3f22585675 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; }
+            }
         }
     }
 }
diff --git a/prebuild.xml b/prebuild.xml
index feab3ee52b..29c2a671c6 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -699,6 +699,7 @@
       </Configuration>
 
       <ReferencePath>../../../../bin/</ReferencePath>
+	<ReferencePath>../../../../bin/Physics/</ReferencePath>
 
       <Reference name="libsecondlife.dll"/>
       <Reference name="System" localCopy="false"/>
@@ -709,7 +710,6 @@
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.UserManagement"/>
       <Reference name="OpenSim.Region.Physics.Manager"/>
-      <Reference name="OpenSim.Region.Physics.BasicPhysicsPlugin"/>
       <Reference name="XMLRPC.dll"/>
       <Reference name="OpenSim.Region.GridInterfaces.Local"/>
       <Reference name="OpenSim.Framework.Servers"/>