OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into careminster

avinationmerge
Melanie 2012-03-28 02:56:31 +01:00
parent 300488f862 b24605d526
commit caaf25c326
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -12522,7 +12522,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
OSDArray FolderData = new OSDArray(); OSDArray FolderData = new OSDArray();
foreach (UUID InventoryFolderBase in folders) foreach (InventoryFolderBase folder in folders)
{ {
OSDMap FolderDataMap = new OSDMap(5); OSDMap FolderDataMap = new OSDMap(5);
FolderDataMap.Add("FolderID", OSD.FromUUID(folder.ID)); FolderDataMap.Add("FolderID", OSD.FromUUID(folder.ID));
@ -12538,7 +12538,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
OSDArray ItemData = new OSDArray(); OSDArray ItemData = new OSDArray();
foreach (UUID InventoryItemBase in items) foreach (InventoryItemBase item in items)
{ {
OSDMap ItemDataMap = new OSDMap(); OSDMap ItemDataMap = new OSDMap();
ItemData.Add(DataMap); ItemData.Add(DataMap);