diff options
author | Diva Canto | 2009-12-31 09:25:16 -0800 |
---|---|---|
committer | Diva Canto | 2009-12-31 09:25:16 -0800 |
commit | a8901a40f4526720f68049706cabd34cf9717172 (patch) | |
tree | f64b2d8eed119e8080e3d696e4e822b55f0f5882 /OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs | |
parent | No-op. (diff) | |
download | opensim-SC-a8901a40f4526720f68049706cabd34cf9717172.zip opensim-SC-a8901a40f4526720f68049706cabd34cf9717172.tar.gz opensim-SC-a8901a40f4526720f68049706cabd34cf9717172.tar.bz2 opensim-SC-a8901a40f4526720f68049706cabd34cf9717172.tar.xz |
Simulation handlers (agents & objects) completed.
Diffstat (limited to 'OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs')
-rw-r--r-- | OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs | 19 |
1 files changed, 7 insertions, 12 deletions
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 | |||
47 | if (serverConfig == null) | 47 | if (serverConfig == null) |
48 | throw new Exception("No section 'SimulationService' in config file"); | 48 | throw new Exception("No section 'SimulationService' in config file"); |
49 | 49 | ||
50 | bool authentication = serverConfig.GetBoolean("RequireAuthentication", false); | ||
51 | |||
52 | if (authentication) | ||
53 | m_AuthenticationService = scene.RequestModuleInterface<IAuthenticationService>(); | ||
54 | |||
55 | bool foreignGuests = serverConfig.GetBoolean("AllowForeignGuests", false); | ||
56 | |||
57 | //string simService = serverConfig.GetString("LocalServiceModule", | 50 | //string simService = serverConfig.GetString("LocalServiceModule", |
58 | // String.Empty); | 51 | // String.Empty); |
59 | 52 | ||
@@ -69,12 +62,14 @@ namespace OpenSim.Server.Handlers.Simulation | |||
69 | 62 | ||
70 | 63 | ||
71 | //System.Console.WriteLine("XXXXXXXXXXXXXXXXXXX m_AssetSetvice == null? " + ((m_AssetService == null) ? "yes" : "no")); | 64 | //System.Console.WriteLine("XXXXXXXXXXXXXXXXXXX m_AssetSetvice == null? " + ((m_AssetService == null) ? "yes" : "no")); |
72 | server.AddStreamHandler(new AgentGetHandler(m_SimulationService, m_AuthenticationService)); | 65 | //server.AddStreamHandler(new AgentGetHandler(m_SimulationService, m_AuthenticationService)); |
73 | server.AddStreamHandler(new AgentPostHandler(m_SimulationService, m_AuthenticationService, foreignGuests)); | 66 | //server.AddStreamHandler(new AgentPostHandler(m_SimulationService, m_AuthenticationService)); |
74 | server.AddStreamHandler(new AgentPutHandler(m_SimulationService, m_AuthenticationService)); | 67 | //server.AddStreamHandler(new AgentPutHandler(m_SimulationService, m_AuthenticationService)); |
75 | server.AddStreamHandler(new AgentDeleteHandler(m_SimulationService, m_AuthenticationService)); | 68 | //server.AddStreamHandler(new AgentDeleteHandler(m_SimulationService, m_AuthenticationService)); |
69 | server.AddHTTPHandler("/agent/", new AgentHandler(m_SimulationService).Handler); | ||
70 | server.AddHTTPHandler("/object/", new ObjectHandler(m_SimulationService).Handler); | ||
71 | |||
76 | //server.AddStreamHandler(new ObjectPostHandler(m_SimulationService, authentication)); | 72 | //server.AddStreamHandler(new ObjectPostHandler(m_SimulationService, authentication)); |
77 | //server.AddStreamHandler(new NeighborPostHandler(m_SimulationService, authentication)); | ||
78 | } | 73 | } |
79 | } | 74 | } |
80 | } | 75 | } |