diff options
Diffstat (limited to 'OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs')
-rw-r--r-- | OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs b/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs index f33eda7..42d8eca 100644 --- a/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs +++ b/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs | |||
@@ -43,30 +43,15 @@ namespace OpenSim.Server.Handlers.Simulation | |||
43 | public SimulationServiceInConnector(IConfigSource config, IHttpServer server, IScene scene) : | 43 | public SimulationServiceInConnector(IConfigSource config, IHttpServer server, IScene scene) : |
44 | base(config, server, String.Empty) | 44 | base(config, server, String.Empty) |
45 | { | 45 | { |
46 | //IConfig serverConfig = config.Configs["SimulationService"]; | ||
47 | //if (serverConfig == null) | ||
48 | // throw new Exception("No section 'SimulationService' in config file"); | ||
49 | |||
50 | //string simService = serverConfig.GetString("LocalServiceModule", | ||
51 | // String.Empty); | ||
52 | |||
53 | //if (simService == String.Empty) | ||
54 | // throw new Exception("No SimulationService in config file"); | ||
55 | |||
56 | //Object[] args = new Object[] { config }; | ||
57 | m_LocalSimulationService = scene.RequestModuleInterface<ISimulationService>(); | 46 | m_LocalSimulationService = scene.RequestModuleInterface<ISimulationService>(); |
58 | m_LocalSimulationService = m_LocalSimulationService.GetInnerService(); | 47 | m_LocalSimulationService = m_LocalSimulationService.GetInnerService(); |
59 | //ServerUtils.LoadPlugin<ISimulationService>(simService, args); | ||
60 | 48 | ||
61 | //System.Console.WriteLine("XXXXXXXXXXXXXXXXXXX m_AssetSetvice == null? " + ((m_AssetService == null) ? "yes" : "no")); | 49 | // This one MUST be a stream handler because compressed fatpacks |
62 | //server.AddStreamHandler(new AgentGetHandler(m_SimulationService, m_AuthenticationService)); | 50 | // are pure binary and shoehorning that into a string with UTF-8 |
63 | //server.AddStreamHandler(new AgentPostHandler(m_SimulationService, m_AuthenticationService)); | 51 | // encoding breaks it |
64 | //server.AddStreamHandler(new AgentPutHandler(m_SimulationService, m_AuthenticationService)); | 52 | server.AddStreamHandler(new AgentPostHandler(m_LocalSimulationService)); |
65 | //server.AddStreamHandler(new AgentDeleteHandler(m_SimulationService, m_AuthenticationService)); | ||
66 | server.AddHTTPHandler("/agent/", new AgentHandler(m_LocalSimulationService).Handler); | 53 | server.AddHTTPHandler("/agent/", new AgentHandler(m_LocalSimulationService).Handler); |
67 | server.AddHTTPHandler("/object/", new ObjectHandler(m_LocalSimulationService).Handler); | 54 | server.AddHTTPHandler("/object/", new ObjectHandler(m_LocalSimulationService).Handler); |
68 | |||
69 | //server.AddStreamHandler(new ObjectPostHandler(m_SimulationService, authentication)); | ||
70 | } | 55 | } |
71 | } | 56 | } |
72 | } | 57 | } |