diff options
| author | Sean McNamara | 2011-04-26 11:45:38 -0400 |
|---|---|---|
| committer | Sean McNamara | 2011-04-26 11:45:38 -0400 |
| commit | 587aa91e36216e75f9b293b57c5b974d31e5ec54 (patch) | |
| tree | a1c2a4e78cb6414cdebb93c46552dce5bc8e7ea0 /OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs | |
| parent | Wait for OnOarFileSaved event callback before executing script (diff) | |
| parent | Removed stale client components: MXP and VWoHTTP. (diff) | |
| download | opensim-SC_OLD-587aa91e36216e75f9b293b57c5b974d31e5ec54.zip opensim-SC_OLD-587aa91e36216e75f9b293b57c5b974d31e5ec54.tar.gz opensim-SC_OLD-587aa91e36216e75f9b293b57c5b974d31e5ec54.tar.bz2 opensim-SC_OLD-587aa91e36216e75f9b293b57c5b974d31e5ec54.tar.xz | |
Merge git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs index c7244c8..6dd871f 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs | |||
| @@ -182,9 +182,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
| 182 | public InventoryCollection GetFolderContent(UUID userID, UUID folderID) | 182 | public InventoryCollection GetFolderContent(UUID userID, UUID folderID) |
| 183 | { | 183 | { |
| 184 | InventoryCollection invCol = m_InventoryService.GetFolderContent(userID, folderID); | 184 | InventoryCollection invCol = m_InventoryService.GetFolderContent(userID, folderID); |
| 185 | if (UserManager != null) | 185 | Util.FireAndForget(delegate |
| 186 | foreach (InventoryItemBase item in invCol.Items) | 186 | { |
| 187 | UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData); | 187 | if (UserManager != null) |
| 188 | foreach (InventoryItemBase item in invCol.Items) | ||
| 189 | UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData); | ||
| 190 | }); | ||
| 188 | 191 | ||
| 189 | return invCol; | 192 | return invCol; |
| 190 | } | 193 | } |