aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/MessagingServer
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Grid/MessagingServer')
-rw-r--r--OpenSim/Grid/MessagingServer/Main.cs13
1 files changed, 5 insertions, 8 deletions
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index 063da55..b288b33 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -44,9 +44,6 @@ namespace OpenSim.Grid.MessagingServer
44 44
45 private MessageServerConfig Cfg; 45 private MessageServerConfig Cfg;
46 private MessageService msgsvc; 46 private MessageService msgsvc;
47
48 //public UserManager m_userManager;
49 //public UserLoginService m_loginService;
50 47
51 private LLUUID m_lastCreatedUser = LLUUID.Random(); 48 private LLUUID m_lastCreatedUser = LLUUID.Random();
52 49
@@ -86,14 +83,14 @@ namespace OpenSim.Grid.MessagingServer
86 Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), "MessagingServer_Config.xml"))); 83 Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), "MessagingServer_Config.xml")));
87 84
88 m_log.Info("[REGION]: Starting HTTP process"); 85 m_log.Info("[REGION]: Starting HTTP process");
89 BaseHttpServer httpServer = new BaseHttpServer(Cfg.HttpPort); 86 m_httpServer = new BaseHttpServer(Cfg.HttpPort);
90 87
91 msgsvc = new MessageService(Cfg); 88 msgsvc = new MessageService(Cfg);
92 89
93 if (msgsvc.registerWithUserServer()) 90 if (msgsvc.registerWithUserServer())
94 { 91 {
95 httpServer.AddXmlRPCHandler("login_to_simulator", msgsvc.UserLoggedOn); 92 m_httpServer.AddXmlRPCHandler("login_to_simulator", msgsvc.UserLoggedOn);
96 httpServer.AddXmlRPCHandler("logout_of_simulator", msgsvc.UserLoggedOff); 93 m_httpServer.AddXmlRPCHandler("logout_of_simulator", msgsvc.UserLoggedOff);
97 //httpServer.AddXmlRPCHandler("get_user_by_name", m_userManager.XmlRPCGetUserMethodName); 94 //httpServer.AddXmlRPCHandler("get_user_by_name", m_userManager.XmlRPCGetUserMethodName);
98 //httpServer.AddXmlRPCHandler("get_user_by_uuid", m_userManager.XmlRPCGetUserMethodUUID); 95 //httpServer.AddXmlRPCHandler("get_user_by_uuid", m_userManager.XmlRPCGetUserMethodUUID);
99 //httpServer.AddXmlRPCHandler("get_avatar_picker_avatar", m_userManager.XmlRPCGetAvatarPickerAvatar); 96 //httpServer.AddXmlRPCHandler("get_avatar_picker_avatar", m_userManager.XmlRPCGetAvatarPickerAvatar);
@@ -106,7 +103,7 @@ namespace OpenSim.Grid.MessagingServer
106 //httpServer.AddStreamHandler( 103 //httpServer.AddStreamHandler(
107 //new RestStreamHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod)); 104 //new RestStreamHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod));
108 105
109 httpServer.Start(); 106 m_httpServer.Start();
110 m_log.Info("[SERVER]: Messageserver 0.5 - Startup complete"); 107 m_log.Info("[SERVER]: Messageserver 0.5 - Startup complete");
111 } 108 }
112 else 109 else