aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-04-08 17:50:57 +0000
committerJustin Clarke Casey2009-04-08 17:50:57 +0000
commitf3c7298fc5bdb35e8a293c9aee4134c8e8fe2856 (patch)
treecdcef4e023e1adf8bb4a83e5ebe81448dbf33c6b /OpenSim/Region/ClientStack/LindenUDP
parent* Fix the remainder of the packets that require sessionId checks. (diff)
downloadopensim-SC_OLD-f3c7298fc5bdb35e8a293c9aee4134c8e8fe2856.zip
opensim-SC_OLD-f3c7298fc5bdb35e8a293c9aee4134c8e8fe2856.tar.gz
opensim-SC_OLD-f3c7298fc5bdb35e8a293c9aee4134c8e8fe2856.tar.bz2
opensim-SC_OLD-f3c7298fc5bdb35e8a293c9aee4134c8e8fe2856.tar.xz
* 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.
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs27
1 files changed, 14 insertions, 13 deletions
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
1729 descend.ItemData[i] = new InventoryDescendentsPacket.ItemDataBlock(); 1729 descend.ItemData[i] = new InventoryDescendentsPacket.ItemDataBlock();
1730 descend.ItemData[i].ItemID = item.ID; 1730 descend.ItemData[i].ItemID = item.ID;
1731 descend.ItemData[i].AssetID = item.AssetID; 1731 descend.ItemData[i].AssetID = item.AssetID;
1732 descend.ItemData[i].CreatorID = item.Creator; 1732 descend.ItemData[i].CreatorID = item.CreatorIdAsUuid;
1733 descend.ItemData[i].BaseMask = item.BasePermissions; 1733 descend.ItemData[i].BaseMask = item.BasePermissions;
1734 descend.ItemData[i].Description = LLUtil.StringToPacketBytes(item.Description); 1734 descend.ItemData[i].Description = LLUtil.StringToPacketBytes(item.Description);
1735 descend.ItemData[i].EveryoneMask = item.EveryOnePermissions; 1735 descend.ItemData[i].EveryoneMask = item.EveryOnePermissions;
@@ -1928,7 +1928,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1928 inventoryReply.InventoryData[0] = new FetchInventoryReplyPacket.InventoryDataBlock(); 1928 inventoryReply.InventoryData[0] = new FetchInventoryReplyPacket.InventoryDataBlock();
1929 inventoryReply.InventoryData[0].ItemID = item.ID; 1929 inventoryReply.InventoryData[0].ItemID = item.ID;
1930 inventoryReply.InventoryData[0].AssetID = item.AssetID; 1930 inventoryReply.InventoryData[0].AssetID = item.AssetID;
1931 inventoryReply.InventoryData[0].CreatorID = item.Creator; 1931 inventoryReply.InventoryData[0].CreatorID = item.CreatorIdAsUuid;
1932 inventoryReply.InventoryData[0].BaseMask = item.BasePermissions; 1932 inventoryReply.InventoryData[0].BaseMask = item.BasePermissions;
1933 inventoryReply.InventoryData[0].CreationDate = item.CreationDate; 1933 inventoryReply.InventoryData[0].CreationDate = item.CreationDate;
1934 1934
@@ -1950,13 +1950,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1950 inventoryReply.InventoryData[0].SaleType = item.SaleType; 1950 inventoryReply.InventoryData[0].SaleType = item.SaleType;
1951 1951
1952 inventoryReply.InventoryData[0].CRC = 1952 inventoryReply.InventoryData[0].CRC =
1953 Helpers.InventoryCRC(1000, 0, inventoryReply.InventoryData[0].InvType, 1953 Helpers.InventoryCRC(
1954 inventoryReply.InventoryData[0].Type, inventoryReply.InventoryData[0].AssetID, 1954 1000, 0, inventoryReply.InventoryData[0].InvType,
1955 inventoryReply.InventoryData[0].GroupID, 100, 1955 inventoryReply.InventoryData[0].Type, inventoryReply.InventoryData[0].AssetID,
1956 inventoryReply.InventoryData[0].OwnerID, inventoryReply.InventoryData[0].CreatorID, 1956 inventoryReply.InventoryData[0].GroupID, 100,
1957 inventoryReply.InventoryData[0].ItemID, inventoryReply.InventoryData[0].FolderID, 1957 inventoryReply.InventoryData[0].OwnerID, inventoryReply.InventoryData[0].CreatorID,
1958 FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, 1958 inventoryReply.InventoryData[0].ItemID, inventoryReply.InventoryData[0].FolderID,
1959 FULL_MASK_PERMISSIONS); 1959 FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS,
1960 FULL_MASK_PERMISSIONS);
1960 inventoryReply.Header.Zerocoded = true; 1961 inventoryReply.Header.Zerocoded = true;
1961 OutPacket(inventoryReply, ThrottleOutPacketType.Asset); 1962 OutPacket(inventoryReply, ThrottleOutPacketType.Asset);
1962 } 1963 }
@@ -2075,7 +2076,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2075 2076
2076 itemBlock.ItemID = item.ID; 2077 itemBlock.ItemID = item.ID;
2077 itemBlock.AssetID = item.AssetID; 2078 itemBlock.AssetID = item.AssetID;
2078 itemBlock.CreatorID = item.Creator; 2079 itemBlock.CreatorID = item.CreatorIdAsUuid;
2079 itemBlock.BaseMask = item.BasePermissions; 2080 itemBlock.BaseMask = item.BasePermissions;
2080 itemBlock.Description = LLUtil.StringToPacketBytes(item.Description); 2081 itemBlock.Description = LLUtil.StringToPacketBytes(item.Description);
2081 itemBlock.EveryoneMask = item.EveryOnePermissions; 2082 itemBlock.EveryoneMask = item.EveryOnePermissions;
@@ -2138,7 +2139,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2138 bulkUpdate.ItemData[0] = new BulkUpdateInventoryPacket.ItemDataBlock(); 2139 bulkUpdate.ItemData[0] = new BulkUpdateInventoryPacket.ItemDataBlock();
2139 bulkUpdate.ItemData[0].ItemID = item.ID; 2140 bulkUpdate.ItemData[0].ItemID = item.ID;
2140 bulkUpdate.ItemData[0].AssetID = item.AssetID; 2141 bulkUpdate.ItemData[0].AssetID = item.AssetID;
2141 bulkUpdate.ItemData[0].CreatorID = item.Creator; 2142 bulkUpdate.ItemData[0].CreatorID = item.CreatorIdAsUuid;
2142 bulkUpdate.ItemData[0].BaseMask = item.BasePermissions; 2143 bulkUpdate.ItemData[0].BaseMask = item.BasePermissions;
2143 bulkUpdate.ItemData[0].CreationDate = item.CreationDate; 2144 bulkUpdate.ItemData[0].CreationDate = item.CreationDate;
2144 bulkUpdate.ItemData[0].Description = LLUtil.StringToPacketBytes(item.Description); 2145 bulkUpdate.ItemData[0].Description = LLUtil.StringToPacketBytes(item.Description);
@@ -2186,7 +2187,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2186 InventoryReply.InventoryData[0] = new UpdateCreateInventoryItemPacket.InventoryDataBlock(); 2187 InventoryReply.InventoryData[0] = new UpdateCreateInventoryItemPacket.InventoryDataBlock();
2187 InventoryReply.InventoryData[0].ItemID = Item.ID; 2188 InventoryReply.InventoryData[0].ItemID = Item.ID;
2188 InventoryReply.InventoryData[0].AssetID = Item.AssetID; 2189 InventoryReply.InventoryData[0].AssetID = Item.AssetID;
2189 InventoryReply.InventoryData[0].CreatorID = Item.Creator; 2190 InventoryReply.InventoryData[0].CreatorID = Item.CreatorIdAsUuid;
2190 InventoryReply.InventoryData[0].BaseMask = Item.BasePermissions; 2191 InventoryReply.InventoryData[0].BaseMask = Item.BasePermissions;
2191 InventoryReply.InventoryData[0].Description = LLUtil.StringToPacketBytes(Item.Description); 2192 InventoryReply.InventoryData[0].Description = LLUtil.StringToPacketBytes(Item.Description);
2192 InventoryReply.InventoryData[0].EveryoneMask = Item.EveryOnePermissions; 2193 InventoryReply.InventoryData[0].EveryoneMask = Item.EveryOnePermissions;
@@ -6746,7 +6747,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6746 InventoryItemBase item = new InventoryItemBase(); 6747 InventoryItemBase item = new InventoryItemBase();
6747 item.ID = rezScriptx.InventoryBlock.ItemID; 6748 item.ID = rezScriptx.InventoryBlock.ItemID;
6748 item.Folder = rezScriptx.InventoryBlock.FolderID; 6749 item.Folder = rezScriptx.InventoryBlock.FolderID;
6749 item.Creator = rezScriptx.InventoryBlock.CreatorID; 6750 item.CreatorId = rezScriptx.InventoryBlock.CreatorID.ToString();
6750 item.Owner = rezScriptx.InventoryBlock.OwnerID; 6751 item.Owner = rezScriptx.InventoryBlock.OwnerID;
6751 item.BasePermissions = rezScriptx.InventoryBlock.BaseMask; 6752 item.BasePermissions = rezScriptx.InventoryBlock.BaseMask;
6752 item.CurrentPermissions = rezScriptx.InventoryBlock.OwnerMask; 6753 item.CurrentPermissions = rezScriptx.InventoryBlock.OwnerMask;