diff options
author | Justin Clark-Casey (justincc) | 2012-04-27 23:46:33 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-04-27 23:46:33 +0100 |
commit | a90b0e302c110068cec0ee7109e796d2d5fdab4d (patch) | |
tree | 22c9fd2b9cb7941b7978a18b1fc836adac05518d /OpenSim/Region/ClientStack/Linden | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-a90b0e302c110068cec0ee7109e796d2d5fdab4d.zip opensim-SC_OLD-a90b0e302c110068cec0ee7109e796d2d5fdab4d.tar.gz opensim-SC_OLD-a90b0e302c110068cec0ee7109e796d2d5fdab4d.tar.bz2 opensim-SC_OLD-a90b0e302c110068cec0ee7109e796d2d5fdab4d.tar.xz |
Revert "Implement bulk inventory update over CAPS (not recursive by design,"
This reverts commit 6e7f13a72d4e43f8ca564247e0b56bf5706bbdb1.
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 48 |
1 files changed, 1 insertions, 47 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index ae5cbff..36ef281 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -12296,7 +12296,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
12296 | ItemData.Add(ItemDataMap); | 12296 | ItemData.Add(ItemDataMap); |
12297 | } | 12297 | } |
12298 | 12298 | ||
12299 | llsd.Add("InventoryData", ItemData); | 12299 | llsd.Add("ItemData", ItemData); |
12300 | 12300 | ||
12301 | eq.Enqueue(BuildEvent("RemoveInventoryItem", | 12301 | eq.Enqueue(BuildEvent("RemoveInventoryItem", |
12302 | llsd), AgentId); | 12302 | llsd), AgentId); |
@@ -12340,14 +12340,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
12340 | llsd), AgentId); | 12340 | llsd), AgentId); |
12341 | } | 12341 | } |
12342 | 12342 | ||
12343 | private byte[] EncodeU32(uint val) | ||
12344 | { | ||
12345 | byte[] ret = BitConverter.GetBytes(val); | ||
12346 | if (BitConverter.IsLittleEndian) | ||
12347 | Array.Reverse(ret); | ||
12348 | return ret; | ||
12349 | } | ||
12350 | |||
12351 | public void SendBulkUpdateInventory(InventoryFolderBase[] folders, InventoryItemBase[] items) | 12343 | public void SendBulkUpdateInventory(InventoryFolderBase[] folders, InventoryItemBase[] items) |
12352 | { | 12344 | { |
12353 | IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>(); | 12345 | IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>(); |
@@ -12363,7 +12355,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
12363 | OSDMap AgentDataMap = new OSDMap(1); | 12355 | OSDMap AgentDataMap = new OSDMap(1); |
12364 | AgentDataMap.Add("AgentID", OSD.FromUUID(AgentId)); | 12356 | AgentDataMap.Add("AgentID", OSD.FromUUID(AgentId)); |
12365 | AgentDataMap.Add("SessionID", OSD.FromUUID(SessionId)); | 12357 | AgentDataMap.Add("SessionID", OSD.FromUUID(SessionId)); |
12366 | AgentDataMap.Add("TransactionID", OSD.FromUUID(UUID.Random())); | ||
12367 | 12358 | ||
12368 | OSDArray AgentData = new OSDArray(1); | 12359 | OSDArray AgentData = new OSDArray(1); |
12369 | AgentData.Add(AgentDataMap); | 12360 | AgentData.Add(AgentDataMap); |
@@ -12391,47 +12382,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
12391 | foreach (InventoryItemBase item in items) | 12382 | foreach (InventoryItemBase item in items) |
12392 | { | 12383 | { |
12393 | OSDMap ItemDataMap = new OSDMap(); | 12384 | OSDMap ItemDataMap = new OSDMap(); |
12394 | |||
12395 | ItemDataMap.Add("ItemID", OSD.FromUUID(item.ID)); | ||
12396 | ItemDataMap.Add("FolderID", OSD.FromUUID(item.Folder)); | ||
12397 | |||
12398 | ItemDataMap.Add("CreatorID", OSD.FromUUID(item.CreatorIdAsUuid)); | ||
12399 | ItemDataMap.Add("OwnerID", OSD.FromUUID(item.Owner)); | ||
12400 | ItemDataMap.Add("GroupID", OSD.FromUUID(item.GroupID)); | ||
12401 | ItemDataMap.Add("BaseMask", OSD.FromBinary(EncodeU32((uint)item.BasePermissions))); | ||
12402 | ItemDataMap.Add("OwnerMask", OSD.FromBinary(EncodeU32((uint)item.CurrentPermissions))); | ||
12403 | ItemDataMap.Add("GroupMask", OSD.FromBinary(EncodeU32((uint)item.GroupPermissions))); | ||
12404 | ItemDataMap.Add("EveryoneMask", OSD.FromBinary(EncodeU32((uint)item.EveryOnePermissions))); | ||
12405 | ItemDataMap.Add("NextOwnerMask", OSD.FromBinary(EncodeU32((uint)item.NextPermissions))); | ||
12406 | ItemDataMap.Add("GroupOwned", OSD.FromBoolean(item.GroupOwned)); | ||
12407 | ItemDataMap.Add("AssetID", OSD.FromUUID(item.AssetID)); | ||
12408 | ItemDataMap.Add("Type", OSD.FromInteger(item.AssetType)); | ||
12409 | ItemDataMap.Add("InvType", OSD.FromInteger(item.InvType)); | ||
12410 | ItemDataMap.Add("Flags", OSD.FromBinary(EncodeU32((uint)item.Flags))); | ||
12411 | ItemDataMap.Add("SaleType", OSD.FromInteger((byte)item.SaleType)); | ||
12412 | ItemDataMap.Add("SalePrice", OSD.FromInteger(item.SalePrice)); | ||
12413 | ItemDataMap.Add("Name", OSD.FromString(item.Name)); | ||
12414 | ItemDataMap.Add("Description", OSD.FromString(item.Description)); | ||
12415 | ItemDataMap.Add("CreationDate", OSD.FromInteger(item.CreationDate)); | ||
12416 | |||
12417 | ItemDataMap.Add("CRC", OSD.FromBinary(EncodeU32( | ||
12418 | Helpers.InventoryCRC(1000, 0, (sbyte)item.InvType, | ||
12419 | (sbyte)item.AssetType, item.AssetID, | ||
12420 | item.GroupID, 100, | ||
12421 | item.Owner, item.CreatorIdAsUuid, | ||
12422 | item.ID, item.Folder, | ||
12423 | (uint)PermissionMask.All, 1, (uint)PermissionMask.All, (uint)PermissionMask.All, | ||
12424 | (uint)PermissionMask.All) | ||
12425 | ))); | ||
12426 | ItemDataMap.Add("CallbackID", 0); | ||
12427 | |||
12428 | ItemData.Add(ItemDataMap); | 12385 | ItemData.Add(ItemDataMap); |
12429 | } | 12386 | } |
12430 | 12387 | ||
12431 | llsd.Add("ItemData", ItemData); | 12388 | llsd.Add("ItemData", ItemData); |
12432 | |||
12433 | eq.Enqueue(BuildEvent("BulkUpdateInventory", | ||
12434 | llsd), AgentId); | ||
12435 | } | 12389 | } |
12436 | } | 12390 | } |
12437 | } | 12391 | } |