aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Examples/SimpleApp
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Examples/SimpleApp')
-rw-r--r--OpenSim/Examples/SimpleApp/MyWorld.cs5
-rw-r--r--OpenSim/Examples/SimpleApp/Program.cs5
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Examples/SimpleApp/MyWorld.cs b/OpenSim/Examples/SimpleApp/MyWorld.cs
index 334b6af..477d29d 100644
--- a/OpenSim/Examples/SimpleApp/MyWorld.cs
+++ b/OpenSim/Examples/SimpleApp/MyWorld.cs
@@ -11,6 +11,7 @@ using OpenSim.Region.Scenes;
11using OpenSim.Framework; 11using OpenSim.Framework;
12using OpenSim.Caches; 12using OpenSim.Caches;
13using OpenGrid.Framework.Communications; 13using OpenGrid.Framework.Communications;
14using OpenSim.Servers;
14 15
15namespace SimpleApp 16namespace SimpleApp
16{ 17{
@@ -19,8 +20,8 @@ namespace SimpleApp
19 private RegionInfo m_regionInfo; 20 private RegionInfo m_regionInfo;
20 private List<OpenSim.Region.Scenes.ScenePresence> m_avatars; 21 private List<OpenSim.Region.Scenes.ScenePresence> m_avatars;
21 22
22 public MyWorld(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach) 23 public MyWorld(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer)
23 : base(clientThreads, regionInfo, authen, commsMan, assetCach) 24 : base(clientThreads, regionInfo, authen, commsMan, assetCach, httpServer)
24 { 25 {
25 m_regionInfo = regionInfo; 26 m_regionInfo = regionInfo;
26 m_avatars = new List<Avatar>(); 27 m_avatars = new List<Avatar>();
diff --git a/OpenSim/Examples/SimpleApp/Program.cs b/OpenSim/Examples/SimpleApp/Program.cs
index 944bca3..ffcaa52 100644
--- a/OpenSim/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Examples/SimpleApp/Program.cs
@@ -56,15 +56,14 @@ namespace SimpleApp
56 CommunicationsManager communicationsManager = new CommunicationsLocal(1000, 1000); 56 CommunicationsManager communicationsManager = new CommunicationsLocal(1000, 1000);
57 57
58 RegionInfo regionInfo = new RegionInfo( ); 58 RegionInfo regionInfo = new RegionInfo( );
59 59 BaseHttpServer httpServer = new BaseHttpServer(simPort);
60 udpServer.LocalWorld = new MyWorld( packetServer.ClientAPIs, regionInfo, m_circuitManager, communicationsManager, assetCache ); 60 udpServer.LocalWorld = new MyWorld( packetServer.ClientAPIs, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer );
61 61
62 // World world = new World(udpServer.PacketServer.ClientAPIs, regionInfo); 62 // World world = new World(udpServer.PacketServer.ClientAPIs, regionInfo);
63 // PhysicsScene physicsScene = new NullPhysicsScene(); 63 // PhysicsScene physicsScene = new NullPhysicsScene();
64 // world.PhysicsScene = physicsScene; 64 // world.PhysicsScene = physicsScene;
65 // udpServer.LocalWorld = world; 65 // udpServer.LocalWorld = world;
66 66
67 BaseHttpServer httpServer = new BaseHttpServer( simPort );
68 httpServer.AddXmlRPCHandler( "login_to_simulator", loginServer.XmlRpcLoginMethod ); 67 httpServer.AddXmlRPCHandler( "login_to_simulator", loginServer.XmlRpcLoginMethod );
69 httpServer.Start(); 68 httpServer.Start();
70 69