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') 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