diff options
| author | Melanie | 2012-03-28 02:56:31 +0100 |
|---|---|---|
| committer | Melanie | 2012-03-28 02:56:31 +0100 |
| commit | caaf25c326604aaafc351027a1b95946fc7d3c96 (patch) | |
| tree | dba89cb4151d968bcde40f9607c357e6b0f3296c | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix typos (diff) | |
| download | opensim-SC-caaf25c326604aaafc351027a1b95946fc7d3c96.zip opensim-SC-caaf25c326604aaafc351027a1b95946fc7d3c96.tar.gz opensim-SC-caaf25c326604aaafc351027a1b95946fc7d3c96.tar.bz2 opensim-SC-caaf25c326604aaafc351027a1b95946fc7d3c96.tar.xz | |
Merge branch 'master' into careminster
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 598bce7..400757f 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
| @@ -12522,7 +12522,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 12522 | 12522 | ||
| 12523 | OSDArray FolderData = new OSDArray(); | 12523 | OSDArray FolderData = new OSDArray(); |
| 12524 | 12524 | ||
| 12525 | foreach (UUID InventoryFolderBase in folders) | 12525 | foreach (InventoryFolderBase folder in folders) |
| 12526 | { | 12526 | { |
| 12527 | OSDMap FolderDataMap = new OSDMap(5); | 12527 | OSDMap FolderDataMap = new OSDMap(5); |
| 12528 | FolderDataMap.Add("FolderID", OSD.FromUUID(folder.ID)); | 12528 | FolderDataMap.Add("FolderID", OSD.FromUUID(folder.ID)); |
| @@ -12538,7 +12538,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 12538 | 12538 | ||
| 12539 | OSDArray ItemData = new OSDArray(); | 12539 | OSDArray ItemData = new OSDArray(); |
| 12540 | 12540 | ||
| 12541 | foreach (UUID InventoryItemBase in items) | 12541 | foreach (InventoryItemBase item in items) |
| 12542 | { | 12542 | { |
| 12543 | OSDMap ItemDataMap = new OSDMap(); | 12543 | OSDMap ItemDataMap = new OSDMap(); |
| 12544 | ItemData.Add(DataMap); | 12544 | ItemData.Add(DataMap); |