diff options
Diffstat (limited to 'OpenSim/Grid/UserServer/UserLoginService.cs')
-rw-r--r-- | OpenSim/Grid/UserServer/UserLoginService.cs | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index 0e61b3c..8488e22 100644 --- a/OpenSim/Grid/UserServer/UserLoginService.cs +++ b/OpenSim/Grid/UserServer/UserLoginService.cs | |||
@@ -46,7 +46,7 @@ namespace OpenSim.Grid.UserServer | |||
46 | public class UserLoginService : LoginService | 46 | public class UserLoginService : LoginService |
47 | { | 47 | { |
48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
49 | 49 | ||
50 | protected IInterServiceInventoryServices m_inventoryService; | 50 | protected IInterServiceInventoryServices m_inventoryService; |
51 | 51 | ||
52 | public event UserLoggedInAtLocation OnUserLoggedInAtLocation; | 52 | public event UserLoggedInAtLocation OnUserLoggedInAtLocation; |
@@ -63,7 +63,7 @@ namespace OpenSim.Grid.UserServer | |||
63 | m_config = config; | 63 | m_config = config; |
64 | m_inventoryService = inventoryService; | 64 | m_inventoryService = inventoryService; |
65 | } | 65 | } |
66 | 66 | ||
67 | public override void LogOffUser(UserProfileData theUser, string message) | 67 | public override void LogOffUser(UserProfileData theUser, string message) |
68 | { | 68 | { |
69 | RegionProfileData SimInfo = null; | 69 | RegionProfileData SimInfo = null; |
@@ -72,7 +72,7 @@ namespace OpenSim.Grid.UserServer | |||
72 | SimInfo = RegionProfileData.RequestSimProfileData( | 72 | SimInfo = RegionProfileData.RequestSimProfileData( |
73 | theUser.CurrentAgent.Handle, m_config.GridServerURL, | 73 | theUser.CurrentAgent.Handle, m_config.GridServerURL, |
74 | m_config.GridSendKey, m_config.GridRecvKey); | 74 | m_config.GridSendKey, m_config.GridRecvKey); |
75 | 75 | ||
76 | if (SimInfo == null) | 76 | if (SimInfo == null) |
77 | { | 77 | { |
78 | m_log.Error("[GRID]: Region user was in isn't currently logged in"); | 78 | m_log.Error("[GRID]: Region user was in isn't currently logged in"); |
@@ -84,7 +84,7 @@ namespace OpenSim.Grid.UserServer | |||
84 | m_log.Error("[GRID]: Unable to look up region to log user off"); | 84 | m_log.Error("[GRID]: Unable to look up region to log user off"); |
85 | return; | 85 | return; |
86 | } | 86 | } |
87 | 87 | ||
88 | // Prepare notification | 88 | // Prepare notification |
89 | Hashtable SimParams = new Hashtable(); | 89 | Hashtable SimParams = new Hashtable(); |
90 | SimParams["agent_id"] = theUser.ID.ToString(); | 90 | SimParams["agent_id"] = theUser.ID.ToString(); |
@@ -101,7 +101,7 @@ namespace OpenSim.Grid.UserServer | |||
101 | m_log.InfoFormat( | 101 | m_log.InfoFormat( |
102 | "[ASSUMED CRASH]: Telling region {0} @ {1},{2} ({3}) that their agent is dead: {4}", | 102 | "[ASSUMED CRASH]: Telling region {0} @ {1},{2} ({3}) that their agent is dead: {4}", |
103 | SimInfo.regionName, SimInfo.regionLocX, SimInfo.regionLocY, SimInfo.httpServerURI, theUser.FirstName + " " + theUser.SurName); | 103 | SimInfo.regionName, SimInfo.regionLocX, SimInfo.regionLocY, SimInfo.httpServerURI, theUser.FirstName + " " + theUser.SurName); |
104 | 104 | ||
105 | try | 105 | try |
106 | { | 106 | { |
107 | XmlRpcRequest GridReq = new XmlRpcRequest("logoff_user", SendParams); | 107 | XmlRpcRequest GridReq = new XmlRpcRequest("logoff_user", SendParams); |
@@ -306,8 +306,6 @@ namespace OpenSim.Grid.UserServer | |||
306 | theUser.FirstName, theUser.SurName); | 306 | theUser.FirstName, theUser.SurName); |
307 | } | 307 | } |
308 | } | 308 | } |
309 | |||
310 | |||
311 | } | 309 | } |
312 | } | 310 | } |
313 | catch (Exception) | 311 | catch (Exception) |
@@ -419,7 +417,7 @@ namespace OpenSim.Grid.UserServer | |||
419 | else | 417 | else |
420 | { | 418 | { |
421 | response.CreateDeadRegionResponse(); | 419 | response.CreateDeadRegionResponse(); |
422 | } | 420 | } |
423 | } | 421 | } |
424 | 422 | ||
425 | catch (Exception e) | 423 | catch (Exception e) |
@@ -432,11 +430,11 @@ namespace OpenSim.Grid.UserServer | |||
432 | 430 | ||
433 | // See LoginService | 431 | // See LoginService |
434 | protected override InventoryData GetInventorySkeleton(LLUUID userID) | 432 | protected override InventoryData GetInventorySkeleton(LLUUID userID) |
435 | { | 433 | { |
436 | m_log.DebugFormat( | 434 | m_log.DebugFormat( |
437 | "[LOGIN]: Contacting inventory service at {0} for inventory skeleton of user {1}", | 435 | "[LOGIN]: Contacting inventory service at {0} for inventory skeleton of user {1}", |
438 | m_config.InventoryUrl, userID); | 436 | m_config.InventoryUrl, userID); |
439 | 437 | ||
440 | List<InventoryFolderBase> folders = m_inventoryService.GetInventorySkeleton(userID); | 438 | List<InventoryFolderBase> folders = m_inventoryService.GetInventorySkeleton(userID); |
441 | 439 | ||
442 | if (null == folders || folders.Count == 0) | 440 | if (null == folders || folders.Count == 0) |