From f3c7298fc5bdb35e8a293c9aee4134c8e8fe2856 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Wed, 8 Apr 2009 17:50:57 +0000
Subject: * Make it possible to store creator strings in user inventory items
 as well as UUIDs * All existing functionality should be unaffected. *
 Database schemas have not been changed.

---
 .../Region/ClientStack/LindenUDP/LLClientView.cs   | 27 +++++++++++-----------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 891fa9e..7e99337 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -1729,7 +1729,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     descend.ItemData[i] = new InventoryDescendentsPacket.ItemDataBlock();
                     descend.ItemData[i].ItemID = item.ID;
                     descend.ItemData[i].AssetID = item.AssetID;
-                    descend.ItemData[i].CreatorID = item.Creator;
+                    descend.ItemData[i].CreatorID = item.CreatorIdAsUuid;
                     descend.ItemData[i].BaseMask = item.BasePermissions;
                     descend.ItemData[i].Description = LLUtil.StringToPacketBytes(item.Description);
                     descend.ItemData[i].EveryoneMask = item.EveryOnePermissions;
@@ -1928,7 +1928,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             inventoryReply.InventoryData[0] = new FetchInventoryReplyPacket.InventoryDataBlock();
             inventoryReply.InventoryData[0].ItemID = item.ID;
             inventoryReply.InventoryData[0].AssetID = item.AssetID;
-            inventoryReply.InventoryData[0].CreatorID = item.Creator;
+            inventoryReply.InventoryData[0].CreatorID = item.CreatorIdAsUuid;
             inventoryReply.InventoryData[0].BaseMask = item.BasePermissions;
             inventoryReply.InventoryData[0].CreationDate = item.CreationDate;
 
@@ -1950,13 +1950,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             inventoryReply.InventoryData[0].SaleType = item.SaleType;
 
             inventoryReply.InventoryData[0].CRC =
-                Helpers.InventoryCRC(1000, 0, inventoryReply.InventoryData[0].InvType,
-                                     inventoryReply.InventoryData[0].Type, inventoryReply.InventoryData[0].AssetID,
-                                     inventoryReply.InventoryData[0].GroupID, 100,
-                                     inventoryReply.InventoryData[0].OwnerID, inventoryReply.InventoryData[0].CreatorID,
-                                     inventoryReply.InventoryData[0].ItemID, inventoryReply.InventoryData[0].FolderID,
-                                     FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS,
-                                     FULL_MASK_PERMISSIONS);
+                Helpers.InventoryCRC(
+                    1000, 0, inventoryReply.InventoryData[0].InvType,
+                    inventoryReply.InventoryData[0].Type, inventoryReply.InventoryData[0].AssetID,
+                    inventoryReply.InventoryData[0].GroupID, 100,
+                    inventoryReply.InventoryData[0].OwnerID, inventoryReply.InventoryData[0].CreatorID,
+                    inventoryReply.InventoryData[0].ItemID, inventoryReply.InventoryData[0].FolderID,
+                    FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS,
+                    FULL_MASK_PERMISSIONS);
             inventoryReply.Header.Zerocoded = true;
             OutPacket(inventoryReply, ThrottleOutPacketType.Asset);
         }
@@ -2075,7 +2076,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             itemBlock.ItemID = item.ID;
             itemBlock.AssetID = item.AssetID;
-            itemBlock.CreatorID = item.Creator;
+            itemBlock.CreatorID = item.CreatorIdAsUuid;
             itemBlock.BaseMask = item.BasePermissions;
             itemBlock.Description = LLUtil.StringToPacketBytes(item.Description);
             itemBlock.EveryoneMask = item.EveryOnePermissions;
@@ -2138,7 +2139,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             bulkUpdate.ItemData[0] = new BulkUpdateInventoryPacket.ItemDataBlock();
             bulkUpdate.ItemData[0].ItemID = item.ID;
             bulkUpdate.ItemData[0].AssetID = item.AssetID;
-            bulkUpdate.ItemData[0].CreatorID = item.Creator;
+            bulkUpdate.ItemData[0].CreatorID = item.CreatorIdAsUuid;
             bulkUpdate.ItemData[0].BaseMask = item.BasePermissions;
             bulkUpdate.ItemData[0].CreationDate = item.CreationDate;
             bulkUpdate.ItemData[0].Description = LLUtil.StringToPacketBytes(item.Description);
@@ -2186,7 +2187,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             InventoryReply.InventoryData[0] = new UpdateCreateInventoryItemPacket.InventoryDataBlock();
             InventoryReply.InventoryData[0].ItemID = Item.ID;
             InventoryReply.InventoryData[0].AssetID = Item.AssetID;
-            InventoryReply.InventoryData[0].CreatorID = Item.Creator;
+            InventoryReply.InventoryData[0].CreatorID = Item.CreatorIdAsUuid;
             InventoryReply.InventoryData[0].BaseMask = Item.BasePermissions;
             InventoryReply.InventoryData[0].Description = LLUtil.StringToPacketBytes(Item.Description);
             InventoryReply.InventoryData[0].EveryoneMask = Item.EveryOnePermissions;
@@ -6746,7 +6747,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     InventoryItemBase item = new InventoryItemBase();
                     item.ID = rezScriptx.InventoryBlock.ItemID;
                     item.Folder = rezScriptx.InventoryBlock.FolderID;
-                    item.Creator = rezScriptx.InventoryBlock.CreatorID;
+                    item.CreatorId = rezScriptx.InventoryBlock.CreatorID.ToString();
                     item.Owner = rezScriptx.InventoryBlock.OwnerID;
                     item.BasePermissions = rezScriptx.InventoryBlock.BaseMask;
                     item.CurrentPermissions = rezScriptx.InventoryBlock.OwnerMask;
-- 
cgit v1.1