diff options
author | Justin Clark-Casey (justincc) | 2009-09-18 22:22:00 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-09-18 22:22:00 +0100 |
commit | 33ea86374a19e9d74d673f363b7981b84afe177c (patch) | |
tree | 4cf3434e10bd72c815f42d4bfff3921afc83ad0e /OpenSim/Region/CoreModules | |
parent | Group Membership information is sent out from two different locations, refact... (diff) | |
download | opensim-SC_OLD-33ea86374a19e9d74d673f363b7981b84afe177c.zip opensim-SC_OLD-33ea86374a19e9d74d673f363b7981b84afe177c.tar.gz opensim-SC_OLD-33ea86374a19e9d74d673f363b7981b84afe177c.tar.bz2 opensim-SC_OLD-33ea86374a19e9d74d673f363b7981b84afe177c.tar.xz |
provide intelligble warning of why load/save iar doesn't work on grid mode, pending a fix
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index 9f49da9..dc201e1 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | |||
@@ -324,6 +324,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
324 | protected CachedUserInfo GetUserInfo(string firstName, string lastName, string pass) | 324 | protected CachedUserInfo GetUserInfo(string firstName, string lastName, string pass) |
325 | { | 325 | { |
326 | CachedUserInfo userInfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(firstName, lastName); | 326 | CachedUserInfo userInfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(firstName, lastName); |
327 | //m_aScene.CommsManager.UserService.GetUserProfile(firstName, lastName); | ||
327 | if (null == userInfo) | 328 | if (null == userInfo) |
328 | { | 329 | { |
329 | m_log.ErrorFormat( | 330 | m_log.ErrorFormat( |
@@ -333,6 +334,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
333 | } | 334 | } |
334 | 335 | ||
335 | string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(pass) + ":" + userInfo.UserProfile.PasswordSalt); | 336 | string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(pass) + ":" + userInfo.UserProfile.PasswordSalt); |
337 | |||
338 | if (userInfo.UserProfile.PasswordHash == null || userInfo.UserProfile.PasswordHash == String.Empty) | ||
339 | { | ||
340 | m_log.ErrorFormat( | ||
341 | "[INVENTORY ARCHIVER]: Sorry, the grid mode service is not providing password hash details for the check. This will be fixed in an OpenSim git revision soon"); | ||
342 | |||
343 | return null; | ||
344 | } | ||
345 | |||
346 | // m_log.DebugFormat( | ||
347 | // "[INVENTORY ARCHIVER]: received salt {0}, hash {1}, supplied hash {2}", | ||
348 | // userInfo.UserProfile.PasswordSalt, userInfo.UserProfile.PasswordHash, md5PasswdHash); | ||
349 | |||
336 | if (userInfo.UserProfile.PasswordHash != md5PasswdHash) | 350 | if (userInfo.UserProfile.PasswordHash != md5PasswdHash) |
337 | { | 351 | { |
338 | m_log.ErrorFormat( | 352 | m_log.ErrorFormat( |