diff options
| author | Melanie | 2011-10-11 21:06:06 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-11 21:06:06 +0100 |
| commit | c95c8ab246132295d2700683feda937d13d14ea5 (patch) | |
| tree | 3114c6e49a2b3acfc39572cc390ad9203d144e5f /OpenSim | |
| parent | Merge commit '42f1b88eb2492f8d218526c1b30ac027a65d67f3' into bigmerge (diff) | |
| parent | Shuffle order of code in invnetory connector GetFolderContent() calls to avoi... (diff) | |
| download | opensim-SC-c95c8ab246132295d2700683feda937d13d14ea5.zip opensim-SC-c95c8ab246132295d2700683feda937d13d14ea5.tar.gz opensim-SC-c95c8ab246132295d2700683feda937d13d14ea5.tar.bz2 opensim-SC-c95c8ab246132295d2700683feda937d13d14ea5.tar.xz | |
Merge commit '8fb3e71b14e28bf8a4ddb72e3d1b529128f090ce' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
Diffstat (limited to '')
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 | |||
| 185 | public InventoryCollection GetFolderContent(UUID userID, UUID folderID) | 185 | public InventoryCollection GetFolderContent(UUID userID, UUID folderID) |
| 186 | { | 186 | { |
| 187 | InventoryCollection invCol = m_InventoryService.GetFolderContent(userID, folderID); | 187 | InventoryCollection invCol = m_InventoryService.GetFolderContent(userID, folderID); |
| 188 | Util.FireAndForget(delegate | 188 | |
| 189 | if (UserManager != null) | ||
| 189 | { | 190 | { |
| 190 | if (UserManager != null) | 191 | // Protect ourselves against the caller subsequently modifying the items list |
| 192 | List<InventoryItemBase> items = new List<InventoryItemBase>(invCol.Items); | ||
| 193 | |||
| 194 | Util.FireAndForget(delegate | ||
| 191 | { | 195 | { |
| 192 | // Protect ourselves against the caller subsequently modifying the items list | 196 | foreach (InventoryItemBase item in items) |
| 193 | foreach (InventoryItemBase item in new List<InventoryItemBase>(invCol.Items)) | ||
| 194 | UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData); | 197 | UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData); |
| 195 | } | 198 | }); |
| 196 | }); | 199 | } |
| 197 | 200 | ||
| 198 | return invCol; | 201 | return invCol; |
| 199 | } | 202 | } |
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 | |||
| 193 | public InventoryCollection GetFolderContent(UUID userID, UUID folderID) | 193 | public InventoryCollection GetFolderContent(UUID userID, UUID folderID) |
| 194 | { | 194 | { |
| 195 | InventoryCollection invCol = m_RemoteConnector.GetFolderContent(userID, folderID); | 195 | InventoryCollection invCol = m_RemoteConnector.GetFolderContent(userID, folderID); |
| 196 | Util.FireAndForget(delegate | 196 | |
| 197 | if (UserManager != null) | ||
| 197 | { | 198 | { |
| 198 | if (UserManager != null) | 199 | // Protect ourselves against the caller subsequently modifying the items list |
| 200 | List<InventoryItemBase> items = new List<InventoryItemBase>(invCol.Items); | ||
| 201 | |||
| 202 | Util.FireAndForget(delegate | ||
| 199 | { | 203 | { |
| 200 | // Protect ourselves against the caller subsequently modifying the items list | 204 | foreach (InventoryItemBase item in items) |
| 201 | foreach (InventoryItemBase item in new List<InventoryItemBase>(invCol.Items)) | ||
| 202 | UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData); | 205 | UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData); |
| 203 | } | 206 | }); |
| 204 | }); | 207 | } |
| 205 | 208 | ||
| 206 | return invCol; | 209 | return invCol; |
| 207 | } | 210 | } |