aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers/Simulation
diff options
context:
space:
mode:
authorDiva Canto2009-12-31 14:59:26 -0800
committerDiva Canto2009-12-31 14:59:26 -0800
commit0ce9be653d2194877cb972cbce261eecb0cd58a8 (patch)
tree6294c927ce714d140165bb32c1a2dbd337f25ea2 /OpenSim/Server/Handlers/Simulation
parentMore progress on both the Simulation service and the Login service. Both stil... (diff)
downloadopensim-SC_OLD-0ce9be653d2194877cb972cbce261eecb0cd58a8.zip
opensim-SC_OLD-0ce9be653d2194877cb972cbce261eecb0cd58a8.tar.gz
opensim-SC_OLD-0ce9be653d2194877cb972cbce261eecb0cd58a8.tar.bz2
opensim-SC_OLD-0ce9be653d2194877cb972cbce261eecb0cd58a8.tar.xz
* 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
Diffstat (limited to 'OpenSim/Server/Handlers/Simulation')
-rw-r--r--OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs12
1 files changed, 4 insertions, 8 deletions
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
37{ 37{
38 public class SimulationServiceInConnector : ServiceConnector 38 public class SimulationServiceInConnector : ServiceConnector
39 { 39 {
40 private ISimulationService m_SimulationService; 40 private ISimulationService m_LocalSimulationService;
41 private IAuthenticationService m_AuthenticationService; 41 private IAuthenticationService m_AuthenticationService;
42 42
43 public SimulationServiceInConnector(IConfigSource config, IHttpServer server, IScene scene) : 43 public SimulationServiceInConnector(IConfigSource config, IHttpServer server, IScene scene) :
@@ -54,20 +54,16 @@ namespace OpenSim.Server.Handlers.Simulation
54 // throw new Exception("No SimulationService in config file"); 54 // throw new Exception("No SimulationService in config file");
55 55
56 //Object[] args = new Object[] { config }; 56 //Object[] args = new Object[] { config };
57 m_SimulationService = scene.RequestModuleInterface<ISimulationService>(); 57 m_LocalSimulationService = scene.RequestModuleInterface<ISimulationService>();
58 //ServerUtils.LoadPlugin<ISimulationService>(simService, args); 58 //ServerUtils.LoadPlugin<ISimulationService>(simService, args);
59 if (m_SimulationService == null)
60 throw new Exception("No Local ISimulationService Module");
61
62
63 59
64 //System.Console.WriteLine("XXXXXXXXXXXXXXXXXXX m_AssetSetvice == null? " + ((m_AssetService == null) ? "yes" : "no")); 60 //System.Console.WriteLine("XXXXXXXXXXXXXXXXXXX m_AssetSetvice == null? " + ((m_AssetService == null) ? "yes" : "no"));
65 //server.AddStreamHandler(new AgentGetHandler(m_SimulationService, m_AuthenticationService)); 61 //server.AddStreamHandler(new AgentGetHandler(m_SimulationService, m_AuthenticationService));
66 //server.AddStreamHandler(new AgentPostHandler(m_SimulationService, m_AuthenticationService)); 62 //server.AddStreamHandler(new AgentPostHandler(m_SimulationService, m_AuthenticationService));
67 //server.AddStreamHandler(new AgentPutHandler(m_SimulationService, m_AuthenticationService)); 63 //server.AddStreamHandler(new AgentPutHandler(m_SimulationService, m_AuthenticationService));
68 //server.AddStreamHandler(new AgentDeleteHandler(m_SimulationService, m_AuthenticationService)); 64 //server.AddStreamHandler(new AgentDeleteHandler(m_SimulationService, m_AuthenticationService));
69 server.AddHTTPHandler("/agent/", new AgentHandler(m_SimulationService).Handler); 65 server.AddHTTPHandler("/agent/", new AgentHandler(m_LocalSimulationService).Handler);
70 server.AddHTTPHandler("/object/", new ObjectHandler(m_SimulationService).Handler); 66 server.AddHTTPHandler("/object/", new ObjectHandler(m_LocalSimulationService).Handler);
71 67
72 //server.AddStreamHandler(new ObjectPostHandler(m_SimulationService, authentication)); 68 //server.AddStreamHandler(new ObjectPostHandler(m_SimulationService, authentication));
73 } 69 }