aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Examples/SimpleApp
diff options
context:
space:
mode:
authorlbsa712007-07-02 08:03:11 +0000
committerlbsa712007-07-02 08:03:11 +0000
commit686f6a83319eaccd27f426eda82c020246566963 (patch)
tree1a2f4d75316282d4d36de11789af7d0e91950254 /OpenSim/Region/Examples/SimpleApp
parent* Applied Weathros/tedd's IP v6 patch (diff)
downloadopensim-SC_OLD-686f6a83319eaccd27f426eda82c020246566963.zip
opensim-SC_OLD-686f6a83319eaccd27f426eda82c020246566963.tar.gz
opensim-SC_OLD-686f6a83319eaccd27f426eda82c020246566963.tar.bz2
opensim-SC_OLD-686f6a83319eaccd27f426eda82c020246566963.tar.xz
* Fixed Issue #161 by using PhysicsScene.Null instead of BasePhysicsScene
* Hid NullPhysicsScene for great justice * Fixed broken Grid build
Diffstat (limited to 'OpenSim/Region/Examples/SimpleApp')
-rw-r--r--OpenSim/Region/Examples/SimpleApp/Program.cs4
-rw-r--r--OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj6
-rw-r--r--OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build1
3 files changed, 2 insertions, 9 deletions
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;
14using OpenSim.Framework.Communications; 14using OpenSim.Framework.Communications;
15using OpenSim.Region.Communications.Local; 15using OpenSim.Region.Communications.Local;
16using OpenSim.Region.ClientStack; 16using OpenSim.Region.ClientStack;
17using OpenSim.Region.Physics.BasicPhysicsPlugin;
18using System.Net; 17using System.Net;
19using libsecondlife.Packets; 18using libsecondlife.Packets;
19using OpenSim.Physics.Manager;
20 20
21namespace SimpleApp 21namespace SimpleApp
22{ 22{
@@ -59,7 +59,7 @@ namespace SimpleApp
59 59
60 BaseHttpServer httpServer = new BaseHttpServer( internalEndPoint.Port ); 60 BaseHttpServer httpServer = new BaseHttpServer( internalEndPoint.Port );
61 MyWorld world = new MyWorld(packetServer.ClientAPIs, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer); 61 MyWorld world = new MyWorld(packetServer.ClientAPIs, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer);
62 world.PhysScene = new BasicScene(); 62 world.PhysScene = PhysicsScene.Null;
63 udpServer.LocalWorld = world; 63 udpServer.LocalWorld = world;
64 64
65 httpServer.AddXmlRPCHandler("login_to_simulator", communicationsManager.UserServices.XmlRpcLoginMethod ); 65 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 @@
140 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 140 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
141 <Private>False</Private> 141 <Private>False</Private>
142 </ProjectReference> 142 </ProjectReference>
143 <ProjectReference Include="..\..\Physics\BasicPhysicsPlugin\OpenSim.Region.Physics.BasicPhysicsPlugin.csproj">
144 <Name>OpenSim.Region.Physics.BasicPhysicsPlugin</Name>
145 <Project>{15B4FEF3-0000-0000-0000-000000000000}</Project>
146 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
147 <Private>False</Private>
148 </ProjectReference>
149 <ProjectReference Include="..\..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj"> 143 <ProjectReference Include="..\..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj">
150 <Name>OpenSim.Region.Physics.Manager</Name> 144 <Name>OpenSim.Region.Physics.Manager</Name>
151 <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project> 145 <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 @@
31 <include name="../../../../bin/OpenSim.Region.Communications.Local.dll" /> 31 <include name="../../../../bin/OpenSim.Region.Communications.Local.dll" />
32 <include name="../../../../bin/OpenSim.Region.Environment.dll" /> 32 <include name="../../../../bin/OpenSim.Region.Environment.dll" />
33 <include name="../../../../bin/OpenSim.Region.GridInterfaces.Local.dll" /> 33 <include name="../../../../bin/OpenSim.Region.GridInterfaces.Local.dll" />
34 <include name="../../../../bin/OpenSim.Region.Physics.BasicPhysicsPlugin.dll" />
35 <include name="../../../../bin/OpenSim.Region.Physics.Manager.dll" /> 34 <include name="../../../../bin/OpenSim.Region.Physics.Manager.dll" />
36 <include name="System.dll" /> 35 <include name="System.dll" />
37 <include name="System.Data.dll.dll" /> 36 <include name="System.Data.dll.dll" />