diff options
| author | Melanie | 2012-08-01 00:08:02 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-01 00:08:02 +0100 |
| commit | 8114260946be8bbe6754d497f104804d203e00e2 (patch) | |
| tree | b87ac81a06f7fffbb39d88e6bc24d4c615b05cee /OpenSim/Services/Connectors | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Resolve a deadlock between INPCModule and SensorRepeat by replacing the Senso... (diff) | |
| download | opensim-SC_OLD-8114260946be8bbe6754d497f104804d203e00e2.zip opensim-SC_OLD-8114260946be8bbe6754d497f104804d203e00e2.tar.gz opensim-SC_OLD-8114260946be8bbe6754d497f104804d203e00e2.tar.bz2 opensim-SC_OLD-8114260946be8bbe6754d497f104804d203e00e2.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Services/Connectors')
| -rw-r--r-- | OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs index 9d96703..fe7a799 100644 --- a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs +++ b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs | |||
| @@ -474,7 +474,7 @@ namespace OpenSim.Services.Connectors | |||
| 474 | 474 | ||
| 475 | List<InventoryItemBase> items = new List<InventoryItemBase>(); | 475 | List<InventoryItemBase> items = new List<InventoryItemBase>(); |
| 476 | 476 | ||
| 477 | foreach (Object o in ret.Values) // getting the values directly, we don't care about the keys item_i | 477 | foreach (Object o in ((Dictionary<string,object>)ret["ITEMS"]).Values) |
| 478 | items.Add(BuildItem((Dictionary<string, object>)o)); | 478 | items.Add(BuildItem((Dictionary<string, object>)o)); |
| 479 | 479 | ||
| 480 | return items; | 480 | return items; |