diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Examples/SimpleApp/Program.cs | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs index 4060d68..0d5b4b3 100644 --- a/OpenSim/Region/Examples/SimpleApp/Program.cs +++ b/OpenSim/Region/Examples/SimpleApp/Program.cs | |||
@@ -14,6 +14,7 @@ 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; | ||
17 | 18 | ||
18 | namespace SimpleApp | 19 | namespace SimpleApp |
19 | { | 20 | { |
@@ -32,11 +33,7 @@ namespace SimpleApp | |||
32 | 33 | ||
33 | string simAddr = "127.0.0.1"; | 34 | string simAddr = "127.0.0.1"; |
34 | int simPort = 9000; | 35 | int simPort = 9000; |
35 | /* | 36 | |
36 | LoginServer loginServer = new LoginServer( simAddr, simPort, 0, 0, false ); | ||
37 | loginServer.Startup(); | ||
38 | loginServer.SetSessionHandler( AddNewSessionHandler );*/ | ||
39 | |||
40 | m_circuitManager = new AuthenticateSessionsBase(); | 37 | m_circuitManager = new AuthenticateSessionsBase(); |
41 | 38 | ||
42 | InventoryCache inventoryCache = new InventoryCache(); | 39 | InventoryCache inventoryCache = new InventoryCache(); |
@@ -53,18 +50,17 @@ namespace SimpleApp | |||
53 | 50 | ||
54 | ClientView.TerrainManager = new TerrainManager(new SecondLife()); | 51 | ClientView.TerrainManager = new TerrainManager(new SecondLife()); |
55 | 52 | ||
56 | CommunicationsManager communicationsManager = new CommunicationsLocal(null); | 53 | NetworkServersInfo serverInfo = new NetworkServersInfo(); |
54 | CommunicationsLocal communicationsManager = new CommunicationsLocal(serverInfo); | ||
55 | |||
56 | RegionInfo regionInfo = new RegionInfo( 1000, 1000, simAddr, simPort, simAddr ); | ||
57 | 57 | ||
58 | RegionInfo regionInfo = new RegionInfo( ); | ||
59 | BaseHttpServer httpServer = new BaseHttpServer(simPort); | 58 | BaseHttpServer httpServer = new BaseHttpServer(simPort); |
60 | udpServer.LocalWorld = new MyWorld( packetServer.ClientAPIs, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer ); | 59 | MyWorld world = new MyWorld(packetServer.ClientAPIs, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer); |
61 | 60 | world.PhysScene = new BasicScene(); | |
62 | // World world = new World(udpServer.PacketServer.ClientAPIs, regionInfo); | 61 | udpServer.LocalWorld = world; |
63 | // PhysicsScene physicsScene = new NullPhysicsScene(); | ||
64 | // world.PhysicsScene = physicsScene; | ||
65 | // udpServer.LocalWorld = world; | ||
66 | 62 | ||
67 | // httpServer.AddXmlRPCHandler( "login_to_simulator", loginServer.XmlRpcLoginMethod ); | 63 | httpServer.AddXmlRPCHandler("login_to_simulator", communicationsManager.UserServices.XmlRpcLoginMethod ); |
68 | httpServer.Start(); | 64 | httpServer.Start(); |
69 | 65 | ||
70 | m_log.WriteLine( LogPriority.NORMAL, "Press enter to quit."); | 66 | m_log.WriteLine( LogPriority.NORMAL, "Press enter to quit."); |