Merge commit '8fb3e71b14e28bf8a4ddb72e3d1b529128f090ce' into bigmerge

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs

2 files changed, 18 insertions, 12 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
index 1c83f8e..097ff1a 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
@@ -185,15 +185,18 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
         public InventoryCollection GetFolderContent(UUID userID, UUID folderID)
         {
             InventoryCollection invCol = m_InventoryService.GetFolderContent(userID, folderID);
-            Util.FireAndForget(delegate
+
+            if (UserManager != null)
             {
-                if (UserManager != null)
+                // Protect ourselves against the caller subsequently modifying the items list
+                List<InventoryItemBase> items = new List<InventoryItemBase>(invCol.Items);
+
+                Util.FireAndForget(delegate
                 {
-                    // Protect ourselves against the caller subsequently modifying the items list
-                    foreach (InventoryItemBase item in new List<InventoryItemBase>(invCol.Items))
+                    foreach (InventoryItemBase item in items)
                         UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData);
-                }
-            });
+                });
+            }
 
             return invCol;
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
index c9c716c..73ab4e3 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
@@ -193,15 +193,18 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
         public InventoryCollection GetFolderContent(UUID userID, UUID folderID)
         {
             InventoryCollection invCol = m_RemoteConnector.GetFolderContent(userID, folderID);
-            Util.FireAndForget(delegate
+
+            if (UserManager != null)
             {
-                if (UserManager != null)
+                // Protect ourselves against the caller subsequently modifying the items list
+                List<InventoryItemBase> items = new List<InventoryItemBase>(invCol.Items);
+
+                Util.FireAndForget(delegate
                 {
-                    // Protect ourselves against the caller subsequently modifying the items list
-                    foreach (InventoryItemBase item in new List<InventoryItemBase>(invCol.Items))
+                    foreach (InventoryItemBase item in items)
                         UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData);
-                }
-            });
+                });
+            }
 
             return invCol;
         }