From a8901a40f4526720f68049706cabd34cf9717172 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Thu, 31 Dec 2009 09:25:16 -0800 Subject: Simulation handlers (agents & objects) completed. --- .../Simulation/SimulationServiceInConnector.cs | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs') diff --git a/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs b/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs index fe93fa5..b2aa52f 100644 --- a/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs +++ b/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs @@ -47,13 +47,6 @@ namespace OpenSim.Server.Handlers.Simulation if (serverConfig == null) throw new Exception("No section 'SimulationService' in config file"); - bool authentication = serverConfig.GetBoolean("RequireAuthentication", false); - - if (authentication) - m_AuthenticationService = scene.RequestModuleInterface(); - - bool foreignGuests = serverConfig.GetBoolean("AllowForeignGuests", false); - //string simService = serverConfig.GetString("LocalServiceModule", // String.Empty); @@ -69,12 +62,14 @@ namespace OpenSim.Server.Handlers.Simulation //System.Console.WriteLine("XXXXXXXXXXXXXXXXXXX m_AssetSetvice == null? " + ((m_AssetService == null) ? "yes" : "no")); - server.AddStreamHandler(new AgentGetHandler(m_SimulationService, m_AuthenticationService)); - server.AddStreamHandler(new AgentPostHandler(m_SimulationService, m_AuthenticationService, foreignGuests)); - server.AddStreamHandler(new AgentPutHandler(m_SimulationService, m_AuthenticationService)); - server.AddStreamHandler(new AgentDeleteHandler(m_SimulationService, m_AuthenticationService)); + //server.AddStreamHandler(new AgentGetHandler(m_SimulationService, m_AuthenticationService)); + //server.AddStreamHandler(new AgentPostHandler(m_SimulationService, m_AuthenticationService)); + //server.AddStreamHandler(new AgentPutHandler(m_SimulationService, m_AuthenticationService)); + //server.AddStreamHandler(new AgentDeleteHandler(m_SimulationService, m_AuthenticationService)); + server.AddHTTPHandler("/agent/", new AgentHandler(m_SimulationService).Handler); + server.AddHTTPHandler("/object/", new ObjectHandler(m_SimulationService).Handler); + //server.AddStreamHandler(new ObjectPostHandler(m_SimulationService, authentication)); - //server.AddStreamHandler(new NeighborPostHandler(m_SimulationService, authentication)); } } } -- cgit v1.1 From 0ce9be653d2194877cb972cbce261eecb0cd58a8 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Thu, 31 Dec 2009 14:59:26 -0800 Subject: * Added the Login server handlers that were lost in yesterday's commit grief * More beef to the LLLoginService * Better design for handling local simulation service --- .../Handlers/Simulation/SimulationServiceInConnector.cs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs') diff --git a/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs b/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs index b2aa52f..8611228 100644 --- a/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs +++ b/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs @@ -37,7 +37,7 @@ namespace OpenSim.Server.Handlers.Simulation { public class SimulationServiceInConnector : ServiceConnector { - private ISimulationService m_SimulationService; + private ISimulationService m_LocalSimulationService; private IAuthenticationService m_AuthenticationService; public SimulationServiceInConnector(IConfigSource config, IHttpServer server, IScene scene) : @@ -54,20 +54,16 @@ namespace OpenSim.Server.Handlers.Simulation // throw new Exception("No SimulationService in config file"); //Object[] args = new Object[] { config }; - m_SimulationService = scene.RequestModuleInterface(); + m_LocalSimulationService = scene.RequestModuleInterface(); //ServerUtils.LoadPlugin(simService, args); - if (m_SimulationService == null) - throw new Exception("No Local ISimulationService Module"); - - //System.Console.WriteLine("XXXXXXXXXXXXXXXXXXX m_AssetSetvice == null? " + ((m_AssetService == null) ? "yes" : "no")); //server.AddStreamHandler(new AgentGetHandler(m_SimulationService, m_AuthenticationService)); //server.AddStreamHandler(new AgentPostHandler(m_SimulationService, m_AuthenticationService)); //server.AddStreamHandler(new AgentPutHandler(m_SimulationService, m_AuthenticationService)); //server.AddStreamHandler(new AgentDeleteHandler(m_SimulationService, m_AuthenticationService)); - server.AddHTTPHandler("/agent/", new AgentHandler(m_SimulationService).Handler); - server.AddHTTPHandler("/object/", new ObjectHandler(m_SimulationService).Handler); + server.AddHTTPHandler("/agent/", new AgentHandler(m_LocalSimulationService).Handler); + server.AddHTTPHandler("/object/", new ObjectHandler(m_LocalSimulationService).Handler); //server.AddStreamHandler(new ObjectPostHandler(m_SimulationService, authentication)); } -- cgit v1.1 From c268e342d19b6cc5969b1c1d94f20a3f4eb844ef Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 3 Jan 2010 09:35:12 -0800 Subject: * Changed ISimulation interface to take a GridRegion as input arg instead of a regionHandle. * Added the RemoteSimulationConnectorModule, which is the replacement for RESTComms. Scenes is not using this yet, only (standalone) Login uses these region modules for now. * Completed SimulationServiceConnector and corresponding handlers. --- OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs') diff --git a/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs b/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs index 8611228..55a575c 100644 --- a/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs +++ b/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs @@ -43,9 +43,9 @@ namespace OpenSim.Server.Handlers.Simulation public SimulationServiceInConnector(IConfigSource config, IHttpServer server, IScene scene) : base(config, server, String.Empty) { - IConfig serverConfig = config.Configs["SimulationService"]; - if (serverConfig == null) - throw new Exception("No section 'SimulationService' in config file"); + //IConfig serverConfig = config.Configs["SimulationService"]; + //if (serverConfig == null) + // throw new Exception("No section 'SimulationService' in config file"); //string simService = serverConfig.GetString("LocalServiceModule", // String.Empty); -- cgit v1.1