From 391633c072792fc36a188d6fa88e994fa150807d Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sat, 6 Jul 2013 18:02:17 -0700 Subject: [PATCH] Some more fixes on strange behaviors of Unknown User, esp. related to large messy inventories and esp. related to kokua --- .../UserManagement/UserManagementModule.cs | 5 ++-- .../RemoteXInventoryServiceConnector.cs | 25 ++++++++++--------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs index 11227ef592..74608b34e6 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs @@ -514,9 +514,8 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement return; } - //try update unknown users - //and creator's home URL's - if ((oldUser.FirstName == "Unknown" && !creatorData.Contains("Unknown")) || (oldUser.HomeURL != null && !creatorData.StartsWith(oldUser.HomeURL))) + //try update unknown users, but don't update anyone else + if (oldUser.FirstName == "Unknown" && !creatorData.Contains("Unknown")) { lock (m_UserCache) m_UserCache.Remove(id); diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs index 8f41355d22..7f78076335 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs @@ -195,19 +195,20 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory { InventoryCollection invCol = m_RemoteConnector.GetFolderContent(userID, folderID); - if (invCol != null && UserManager != null) - { - // Protect ourselves against the caller subsequently modifying the items list - List items = new List(invCol.Items); + // Commenting this for now, because it's causing more grief than good + //if (invCol != null && UserManager != null) + //{ + // // Protect ourselves against the caller subsequently modifying the items list + // List items = new List(invCol.Items); - if (items != null && items.Count > 0) - //Util.FireAndForget(delegate - //{ - foreach (InventoryItemBase item in items) - if (!string.IsNullOrEmpty(item.CreatorData)) - UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData); - //}); - } + // if (items != null && items.Count > 0) + // //Util.FireAndForget(delegate + // //{ + // foreach (InventoryItemBase item in items) + // if (!string.IsNullOrEmpty(item.CreatorData)) + // UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData); + // //}); + //} return invCol; }