diff options
author | Justin Clark-Casey (justincc) | 2009-09-24 15:19:47 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-09-24 15:19:47 +0100 |
commit | f62b5e6cec31fe496ec4b9f7dcd6ae1f4063bead (patch) | |
tree | 2a66b92715f0faa4e624cbfcef0db24b8feb795e /OpenSim/Region/CoreModules/Avatar/Inventory | |
parent | minor: replace xmlprc 'no method found' magic number with constant from xmlrp... (diff) | |
download | opensim-SC_OLD-f62b5e6cec31fe496ec4b9f7dcd6ae1f4063bead.zip opensim-SC_OLD-f62b5e6cec31fe496ec4b9f7dcd6ae1f4063bead.tar.gz opensim-SC_OLD-f62b5e6cec31fe496ec4b9f7dcd6ae1f4063bead.tar.bz2 opensim-SC_OLD-f62b5e6cec31fe496ec4b9f7dcd6ae1f4063bead.tar.xz |
Produce a different error message if the user service does not have the authenticate method available
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index b82b940..55dce05 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | |||
@@ -333,16 +333,23 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
333 | return null; | 333 | return null; |
334 | } | 334 | } |
335 | 335 | ||
336 | if (m_aScene.CommsManager.UserService.AuthenticateUserByPassword(userInfo.UserProfile.ID, pass)) | 336 | try |
337 | { | 337 | { |
338 | return userInfo; | 338 | if (m_aScene.CommsManager.UserService.AuthenticateUserByPassword(userInfo.UserProfile.ID, pass)) |
339 | { | ||
340 | return userInfo; | ||
341 | } | ||
342 | else | ||
343 | { | ||
344 | m_log.ErrorFormat( | ||
345 | "[INVENTORY ARCHIVER]: Password for user {0} {1} incorrect. Please try again.", | ||
346 | firstName, lastName); | ||
347 | return null; | ||
348 | } | ||
339 | } | 349 | } |
340 | else | 350 | catch (Exception e) |
341 | { | 351 | { |
342 | m_log.ErrorFormat( | 352 | m_log.ErrorFormat("[INVENTORY ARCHIVER]: Could not authenticate password, {0}", e.Message); |
343 | "[INVENTORY ARCHIVER]: Password for user {0} {1} incorrect. Please try again.", | ||
344 | firstName, lastName); | ||
345 | |||
346 | return null; | 353 | return null; |
347 | } | 354 | } |
348 | } | 355 | } |
@@ -364,9 +371,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
364 | { | 371 | { |
365 | foreach (InventoryNodeBase node in loadedNodes) | 372 | foreach (InventoryNodeBase node in loadedNodes) |
366 | { | 373 | { |
367 | m_log.DebugFormat( | 374 | // m_log.DebugFormat( |
368 | "[INVENTORY ARCHIVER]: Notifying {0} of loaded inventory node {1}", | 375 | // "[INVENTORY ARCHIVER]: Notifying {0} of loaded inventory node {1}", |
369 | user.Name, node.Name); | 376 | // user.Name, node.Name); |
370 | 377 | ||
371 | user.ControllingClient.SendBulkUpdateInventory(node); | 378 | user.ControllingClient.SendBulkUpdateInventory(node); |
372 | } | 379 | } |