Started work on CAPS support, now we have our first test capability, MapLayer requests are handled by CAPS.

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;
 using OpenSim.Framework;

 using OpenSim.Caches;

 using OpenGrid.Framework.Communications;

+using OpenSim.Servers;

 

 namespace SimpleApp

 {

@@ -19,8 +20,8 @@ namespace SimpleApp
         private RegionInfo m_regionInfo;

         private List<OpenSim.Region.Scenes.ScenePresence> m_avatars;

 

-        public MyWorld(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach)

-            : base(clientThreads, regionInfo, authen, commsMan, assetCach)

+        public MyWorld(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer)

+            : base(clientThreads, regionInfo, authen, commsMan, assetCach, httpServer)

         {

             m_regionInfo = regionInfo;

             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
             CommunicationsManager communicationsManager = new CommunicationsLocal(1000, 1000);

             

             RegionInfo regionInfo = new RegionInfo( );

-

-            udpServer.LocalWorld = new MyWorld( packetServer.ClientAPIs, regionInfo, m_circuitManager, communicationsManager, assetCache );

+            BaseHttpServer httpServer = new BaseHttpServer(simPort);

+            udpServer.LocalWorld = new MyWorld( packetServer.ClientAPIs, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer );

 

             // World world = new World(udpServer.PacketServer.ClientAPIs, regionInfo);            

             // PhysicsScene physicsScene = new NullPhysicsScene();

             // world.PhysicsScene = physicsScene;

             // udpServer.LocalWorld = world;

 

-            BaseHttpServer httpServer = new BaseHttpServer( simPort );

             httpServer.AddXmlRPCHandler( "login_to_simulator", loginServer.XmlRpcLoginMethod );

             httpServer.Start();