diff options
author | lbsa71 | 2007-07-02 08:03:11 +0000 |
---|---|---|
committer | lbsa71 | 2007-07-02 08:03:11 +0000 |
commit | 686f6a83319eaccd27f426eda82c020246566963 (patch) | |
tree | 1a2f4d75316282d4d36de11789af7d0e91950254 /OpenSim/Region/Examples/SimpleApp/Program.cs | |
parent | * Applied Weathros/tedd's IP v6 patch (diff) | |
download | opensim-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/Program.cs')
-rw-r--r-- | OpenSim/Region/Examples/SimpleApp/Program.cs | 4 |
1 files changed, 2 insertions, 2 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; | |||
14 | using OpenSim.Framework.Communications; | 14 | using OpenSim.Framework.Communications; |
15 | using OpenSim.Region.Communications.Local; | 15 | using OpenSim.Region.Communications.Local; |
16 | using OpenSim.Region.ClientStack; | 16 | using OpenSim.Region.ClientStack; |
17 | using OpenSim.Region.Physics.BasicPhysicsPlugin; | ||
18 | using System.Net; | 17 | using System.Net; |
19 | using libsecondlife.Packets; | 18 | using libsecondlife.Packets; |
19 | using OpenSim.Physics.Manager; | ||
20 | 20 | ||
21 | namespace SimpleApp | 21 | namespace 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 ); |