From 686f6a83319eaccd27f426eda82c020246566963 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Mon, 2 Jul 2007 08:03:11 +0000
Subject: * Fixed Issue #161 by using PhysicsScene.Null instead of
 BasePhysicsScene * Hid NullPhysicsScene for great justice * Fixed broken Grid
 build

---
 OpenSim/Region/Examples/SimpleApp/Program.cs          | 4 ++--
 OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj    | 6 ------
 OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build | 1 -
 3 files changed, 2 insertions(+), 9 deletions(-)

(limited to 'OpenSim/Region/Examples')

diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index 8e9ad75..3d9dd0d 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 d39d091..bb8dcc0 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 db44992..aab0826 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" />
-- 
cgit v1.1