aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2008-08-30 13:06:58 +0000
committerAdam Frisby2008-08-30 13:06:58 +0000
commit618ccd4ebc5c4d6d182d40bf308d08913cecf359 (patch)
tree69c226fa582b8b2d8ee9ac6eafc59283b214b8be
parent* More cleanup, including UserManager. (diff)
downloadopensim-SC_OLD-618ccd4ebc5c4d6d182d40bf308d08913cecf359.zip
opensim-SC_OLD-618ccd4ebc5c4d6d182d40bf308d08913cecf359.tar.gz
opensim-SC_OLD-618ccd4ebc5c4d6d182d40bf308d08913cecf359.tar.bz2
opensim-SC_OLD-618ccd4ebc5c4d6d182d40bf308d08913cecf359.tar.xz
* Ditto, UserServer/Main.cs
-rw-r--r--OpenSim/Grid/UserServer/Main.cs48
1 files changed, 23 insertions, 25 deletions
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index db38b32..eeeea79 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -104,7 +104,7 @@ namespace OpenSim.Grid.UserServer
104 m_interServiceInventoryService = new OGS1InterServiceInventoryService(Cfg.InventoryUrl); 104 m_interServiceInventoryService = new OGS1InterServiceInventoryService(Cfg.InventoryUrl);
105 105
106 m_loginService = new UserLoginService( 106 m_loginService = new UserLoginService(
107 m_userManager, m_interServiceInventoryService, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg); 107 m_userManager, m_interServiceInventoryService, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg);
108 108
109 m_messagesService = new MessageServersConnector(); 109 m_messagesService = new MessageServersConnector();
110 110
@@ -136,7 +136,8 @@ namespace OpenSim.Grid.UserServer
136 m_httpServer.AddXmlRPCHandler("get_avatar_picker_avatar", m_userManager.XmlRPCGetAvatarPickerAvatar); 136 m_httpServer.AddXmlRPCHandler("get_avatar_picker_avatar", m_userManager.XmlRPCGetAvatarPickerAvatar);
137 m_httpServer.AddXmlRPCHandler("add_new_user_friend", m_userManager.XmlRpcResponseXmlRPCAddUserFriend); 137 m_httpServer.AddXmlRPCHandler("add_new_user_friend", m_userManager.XmlRpcResponseXmlRPCAddUserFriend);
138 m_httpServer.AddXmlRPCHandler("remove_user_friend", m_userManager.XmlRpcResponseXmlRPCRemoveUserFriend); 138 m_httpServer.AddXmlRPCHandler("remove_user_friend", m_userManager.XmlRpcResponseXmlRPCRemoveUserFriend);
139 m_httpServer.AddXmlRPCHandler("update_user_friend_perms", m_userManager.XmlRpcResponseXmlRPCUpdateUserFriendPerms); 139 m_httpServer.AddXmlRPCHandler("update_user_friend_perms",
140 m_userManager.XmlRpcResponseXmlRPCUpdateUserFriendPerms);
140 m_httpServer.AddXmlRPCHandler("get_user_friend_list", m_userManager.XmlRpcResponseXmlRPCGetUserFriendList); 141 m_httpServer.AddXmlRPCHandler("get_user_friend_list", m_userManager.XmlRpcResponseXmlRPCGetUserFriendList);
141 m_httpServer.AddXmlRPCHandler("get_avatar_appearance", m_userManager.XmlRPCGetAvatarAppearance); 142 m_httpServer.AddXmlRPCHandler("get_avatar_appearance", m_userManager.XmlRPCGetAvatarAppearance);
142 m_httpServer.AddXmlRPCHandler("update_avatar_appearance", m_userManager.XmlRPCUpdateAvatarAppearance); 143 m_httpServer.AddXmlRPCHandler("update_avatar_appearance", m_userManager.XmlRPCUpdateAvatarAppearance);
@@ -149,7 +150,8 @@ namespace OpenSim.Grid.UserServer
149 m_httpServer.AddXmlRPCHandler("agent_change_region", m_messagesService.XmlRPCUserMovedtoRegion); 150 m_httpServer.AddXmlRPCHandler("agent_change_region", m_messagesService.XmlRPCUserMovedtoRegion);
150 m_httpServer.AddXmlRPCHandler("deregister_messageserver", m_messagesService.XmlRPCDeRegisterMessageServer); 151 m_httpServer.AddXmlRPCHandler("deregister_messageserver", m_messagesService.XmlRPCDeRegisterMessageServer);
151 152
152 m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod)); 153 m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info",
154 m_gridInfoService.RestGetGridInfoMethod));
153 m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod); 155 m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod);
154 156
155 m_httpServer.AddStreamHandler( 157 m_httpServer.AddStreamHandler(
@@ -163,18 +165,12 @@ namespace OpenSim.Grid.UserServer
163 switch (what) 165 switch (what)
164 { 166 {
165 case "user": 167 case "user":
166 string tempfirstname; 168 string tempfirstname = m_console.CmdPrompt("First name");
167 string templastname; 169 string templastname = m_console.CmdPrompt("Last name");
168 string tempMD5Passwd;
169 uint regX = 1000;
170 uint regY = 1000;
171
172 tempfirstname = m_console.CmdPrompt("First name");
173 templastname = m_console.CmdPrompt("Last name");
174 //tempMD5Passwd = m_console.PasswdPrompt("Password"); 170 //tempMD5Passwd = m_console.PasswdPrompt("Password");
175 tempMD5Passwd = m_console.CmdPrompt("Password"); 171 string tempMD5Passwd = m_console.CmdPrompt("Password");
176 regX = Convert.ToUInt32(m_console.CmdPrompt("Start Region X")); 172 uint regX = Convert.ToUInt32(m_console.CmdPrompt("Start Region X"));
177 regY = Convert.ToUInt32(m_console.CmdPrompt("Start Region Y")); 173 uint regY = Convert.ToUInt32(m_console.CmdPrompt("Start Region Y"));
178 174
179 if (null != m_userManager.GetUserProfile(tempfirstname, templastname)) 175 if (null != m_userManager.GetUserProfile(tempfirstname, templastname))
180 { 176 {
@@ -204,7 +200,7 @@ namespace OpenSim.Grid.UserServer
204 throw new Exception( 200 throw new Exception(
205 String.Format( 201 String.Format(
206 "The inventory creation request for user {0} did not succeed." 202 "The inventory creation request for user {0} did not succeed."
207 + " Please contact your inventory service provider for more information.", 203 + " Please contact your inventory service provider for more information.",
208 userID)); 204 userID));
209 } 205 }
210 } 206 }
@@ -232,7 +228,8 @@ namespace OpenSim.Grid.UserServer
232 { 228 {
233 case "help": 229 case "help":
234 m_console.Notice("create user - create a new user"); 230 m_console.Notice("create user - create a new user");
235 m_console.Notice("logoff-user <firstname> <lastname> <message> - logs off the specified user from the grid"); 231 m_console.Notice(
232 "logoff-user <firstname> <lastname> <message> - logs off the specified user from the grid");
236 break; 233 break;
237 234
238 case "create": 235 case "create":
@@ -282,7 +279,8 @@ namespace OpenSim.Grid.UserServer
282 } 279 }
283 else 280 else
284 { 281 {
285 m_log.Info("[LOGOFF]: User Doesn't appear to be online, sending the logoff message anyway."); 282 m_log.Info(
283 "[LOGOFF]: User Doesn't appear to be online, sending the logoff message anyway.");
286 m_loginService.LogOffUser(theUser, message); 284 m_loginService.LogOffUser(theUser, message);
287 285
288 theUser.CurrentAgent.AgentOnline = false; 286 theUser.CurrentAgent.AgentOnline = false;
@@ -292,9 +290,9 @@ namespace OpenSim.Grid.UserServer
292 } 290 }
293 else 291 else
294 { 292 {
295 m_log.Error("[LOGOFF]: Unable to logoff-user. User doesn't have an agent record so I can't find the simulator to notify"); 293 m_log.Error(
294 "[LOGOFF]: Unable to logoff-user. User doesn't have an agent record so I can't find the simulator to notify");
296 } 295 }
297
298 } 296 }
299 else 297 else
300 { 298 {
@@ -303,7 +301,8 @@ namespace OpenSim.Grid.UserServer
303 } 301 }
304 else 302 else
305 { 303 {
306 m_log.Error("[LOGOFF]: Invalid amount of parameters. logoff-user takes at least three. Firstname, Lastname, and message"); 304 m_log.Error(
305 "[LOGOFF]: Invalid amount of parameters. logoff-user takes at least three. Firstname, Lastname, and message");
307 } 306 }
308 307
309 break; 308 break;
@@ -328,12 +327,11 @@ namespace OpenSim.Grid.UserServer
328 } 327 }
329 328
330 public void NotifyMessageServersUserLoggedInToLocation(LLUUID agentID, LLUUID sessionID, LLUUID RegionID, 329 public void NotifyMessageServersUserLoggedInToLocation(LLUUID agentID, LLUUID sessionID, LLUUID RegionID,
331 ulong regionhandle, float positionX, float positionY, 330 ulong regionhandle, float positionX, float positionY,
332 float positionZ, string firstname, string lastname) 331 float positionZ, string firstname, string lastname)
333 { 332 {
334
335 m_messagesService.TellMessageServersAboutUser(agentID, sessionID, RegionID, regionhandle, positionX, 333 m_messagesService.TellMessageServersAboutUser(agentID, sessionID, RegionID, regionhandle, positionX,
336 positionY, positionZ, firstname, lastname); 334 positionY, positionZ, firstname, lastname);
337 } 335 }
338 } 336 }
339} 337} \ No newline at end of file