From a90b0e302c110068cec0ee7109e796d2d5fdab4d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 27 Apr 2012 23:46:33 +0100
Subject: Revert "Implement bulk inventory update over CAPS (not recursive by
 design,"

This reverts commit 6e7f13a72d4e43f8ca564247e0b56bf5706bbdb1.
---
 .../Region/ClientStack/Linden/UDP/LLClientView.cs  | 48 +---------------------
 1 file changed, 1 insertion(+), 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
                 ItemData.Add(ItemDataMap);
             }
 
-            llsd.Add("InventoryData", ItemData);
+            llsd.Add("ItemData", ItemData);
 
             eq.Enqueue(BuildEvent("RemoveInventoryItem",
                     llsd), AgentId);
@@ -12340,14 +12340,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     llsd), AgentId);
         }
 
-        private byte[] EncodeU32(uint val)
-        {
-            byte[] ret = BitConverter.GetBytes(val);
-            if (BitConverter.IsLittleEndian)
-                Array.Reverse(ret);
-            return ret;
-        }
-
         public void SendBulkUpdateInventory(InventoryFolderBase[] folders, InventoryItemBase[] items)
         {
             IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>();
@@ -12363,7 +12355,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             OSDMap AgentDataMap = new OSDMap(1);
             AgentDataMap.Add("AgentID", OSD.FromUUID(AgentId));
             AgentDataMap.Add("SessionID", OSD.FromUUID(SessionId));
-            AgentDataMap.Add("TransactionID", OSD.FromUUID(UUID.Random()));
 
             OSDArray AgentData = new OSDArray(1);
             AgentData.Add(AgentDataMap);
@@ -12391,47 +12382,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             foreach (InventoryItemBase item in items)
             {
                 OSDMap ItemDataMap = new OSDMap();
-                
-                ItemDataMap.Add("ItemID", OSD.FromUUID(item.ID));
-                ItemDataMap.Add("FolderID", OSD.FromUUID(item.Folder));
-
-                ItemDataMap.Add("CreatorID", OSD.FromUUID(item.CreatorIdAsUuid));
-                ItemDataMap.Add("OwnerID", OSD.FromUUID(item.Owner));
-                ItemDataMap.Add("GroupID", OSD.FromUUID(item.GroupID));
-                ItemDataMap.Add("BaseMask", OSD.FromBinary(EncodeU32((uint)item.BasePermissions)));
-                ItemDataMap.Add("OwnerMask", OSD.FromBinary(EncodeU32((uint)item.CurrentPermissions)));
-                ItemDataMap.Add("GroupMask", OSD.FromBinary(EncodeU32((uint)item.GroupPermissions)));
-                ItemDataMap.Add("EveryoneMask", OSD.FromBinary(EncodeU32((uint)item.EveryOnePermissions)));
-                ItemDataMap.Add("NextOwnerMask", OSD.FromBinary(EncodeU32((uint)item.NextPermissions)));
-                ItemDataMap.Add("GroupOwned", OSD.FromBoolean(item.GroupOwned));
-                ItemDataMap.Add("AssetID", OSD.FromUUID(item.AssetID));
-                ItemDataMap.Add("Type", OSD.FromInteger(item.AssetType));
-                ItemDataMap.Add("InvType", OSD.FromInteger(item.InvType));
-                ItemDataMap.Add("Flags", OSD.FromBinary(EncodeU32((uint)item.Flags)));
-                ItemDataMap.Add("SaleType", OSD.FromInteger((byte)item.SaleType));
-                ItemDataMap.Add("SalePrice", OSD.FromInteger(item.SalePrice));
-                ItemDataMap.Add("Name", OSD.FromString(item.Name));
-                ItemDataMap.Add("Description", OSD.FromString(item.Description));
-                ItemDataMap.Add("CreationDate", OSD.FromInteger(item.CreationDate));
-
-                ItemDataMap.Add("CRC", OSD.FromBinary(EncodeU32(
-                        Helpers.InventoryCRC(1000, 0, (sbyte)item.InvType,
-                        (sbyte)item.AssetType, item.AssetID,
-                        item.GroupID, 100,
-                        item.Owner, item.CreatorIdAsUuid,
-                        item.ID, item.Folder,
-                        (uint)PermissionMask.All, 1, (uint)PermissionMask.All, (uint)PermissionMask.All,
-                        (uint)PermissionMask.All)
-                )));
-                ItemDataMap.Add("CallbackID", 0);
-
                 ItemData.Add(ItemDataMap);
             }
 
             llsd.Add("ItemData", ItemData);
-
-            eq.Enqueue(BuildEvent("BulkUpdateInventory",
-                    llsd), AgentId);
         }
     }
 }
-- 
cgit v1.1