diff options
author | Diva Canto | 2013-07-06 18:02:17 -0700 |
---|---|---|
committer | Diva Canto | 2013-07-06 18:02:17 -0700 |
commit | 391633c072792fc36a188d6fa88e994fa150807d (patch) | |
tree | 9c1230ae05a653cc8c55c8629e32601d204247d4 | |
parent | MORE DEBUG. DON"T USE THIS. (diff) | |
download | opensim-SC-391633c072792fc36a188d6fa88e994fa150807d.zip opensim-SC-391633c072792fc36a188d6fa88e994fa150807d.tar.gz opensim-SC-391633c072792fc36a188d6fa88e994fa150807d.tar.bz2 opensim-SC-391633c072792fc36a188d6fa88e994fa150807d.tar.xz |
Some more fixes on strange behaviors of Unknown User, esp. related to large messy inventories and esp. related to kokua
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs | 27 |
2 files changed, 16 insertions, 16 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs index 11227ef..74608b3 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 | |||
514 | return; | 514 | return; |
515 | } | 515 | } |
516 | 516 | ||
517 | //try update unknown users | 517 | //try update unknown users, but don't update anyone else |
518 | //and creator's home URL's | 518 | if (oldUser.FirstName == "Unknown" && !creatorData.Contains("Unknown")) |
519 | if ((oldUser.FirstName == "Unknown" && !creatorData.Contains("Unknown")) || (oldUser.HomeURL != null && !creatorData.StartsWith(oldUser.HomeURL))) | ||
520 | { | 519 | { |
521 | lock (m_UserCache) | 520 | lock (m_UserCache) |
522 | m_UserCache.Remove(id); | 521 | m_UserCache.Remove(id); |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs index 8f41355..7f78076 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 | |||
195 | { | 195 | { |
196 | InventoryCollection invCol = m_RemoteConnector.GetFolderContent(userID, folderID); | 196 | InventoryCollection invCol = m_RemoteConnector.GetFolderContent(userID, folderID); |
197 | 197 | ||
198 | if (invCol != null && UserManager != null) | 198 | // Commenting this for now, because it's causing more grief than good |
199 | { | 199 | //if (invCol != null && UserManager != null) |
200 | // Protect ourselves against the caller subsequently modifying the items list | 200 | //{ |
201 | List<InventoryItemBase> items = new List<InventoryItemBase>(invCol.Items); | 201 | // // Protect ourselves against the caller subsequently modifying the items list |
202 | 202 | // List<InventoryItemBase> items = new List<InventoryItemBase>(invCol.Items); | |
203 | if (items != null && items.Count > 0) | 203 | |
204 | //Util.FireAndForget(delegate | 204 | // if (items != null && items.Count > 0) |
205 | //{ | 205 | // //Util.FireAndForget(delegate |
206 | foreach (InventoryItemBase item in items) | 206 | // //{ |
207 | if (!string.IsNullOrEmpty(item.CreatorData)) | 207 | // foreach (InventoryItemBase item in items) |
208 | UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData); | 208 | // if (!string.IsNullOrEmpty(item.CreatorData)) |
209 | //}); | 209 | // UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData); |
210 | } | 210 | // //}); |
211 | //} | ||
211 | 212 | ||
212 | return invCol; | 213 | return invCol; |
213 | } | 214 | } |