aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs14
1 files changed, 6 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index bb43750..ea82a37 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -1561,10 +1561,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1561 descend.ItemData[i].OwnerID = item.Owner; 1561 descend.ItemData[i].OwnerID = item.Owner;
1562 descend.ItemData[i].Type = (sbyte)item.AssetType; 1562 descend.ItemData[i].Type = (sbyte)item.AssetType;
1563 1563
1564 //descend.ItemData[i].GroupID = new UUID("00000000-0000-0000-0000-000000000000");
1565 descend.ItemData[i].GroupID = item.GroupID; 1564 descend.ItemData[i].GroupID = item.GroupID;
1566 descend.ItemData[i].GroupOwned = item.GroupOwned; 1565 descend.ItemData[i].GroupOwned = item.GroupOwned;
1567 descend.ItemData[i].GroupMask = 0; 1566 descend.ItemData[i].GroupMask = item.GroupPermissions;
1568 descend.ItemData[i].CreationDate = item.CreationDate; 1567 descend.ItemData[i].CreationDate = item.CreationDate;
1569 descend.ItemData[i].SalePrice = item.SalePrice; 1568 descend.ItemData[i].SalePrice = item.SalePrice;
1570 descend.ItemData[i].SaleType = item.SaleType; 1569 descend.ItemData[i].SaleType = item.SaleType;
@@ -1708,10 +1707,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1708 inventoryReply.InventoryData[0].OwnerMask = item.CurrentPermissions; 1707 inventoryReply.InventoryData[0].OwnerMask = item.CurrentPermissions;
1709 inventoryReply.InventoryData[0].Type = (sbyte)item.AssetType; 1708 inventoryReply.InventoryData[0].Type = (sbyte)item.AssetType;
1710 1709
1711 //inventoryReply.InventoryData[0].GroupID = new UUID("00000000-0000-0000-0000-000000000000");
1712 inventoryReply.InventoryData[0].GroupID = item.GroupID; 1710 inventoryReply.InventoryData[0].GroupID = item.GroupID;
1713 inventoryReply.InventoryData[0].GroupOwned = item.GroupOwned; 1711 inventoryReply.InventoryData[0].GroupOwned = item.GroupOwned;
1714 inventoryReply.InventoryData[0].GroupMask = 0; 1712 inventoryReply.InventoryData[0].GroupMask = item.GroupPermissions;
1715 inventoryReply.InventoryData[0].Flags = item.Flags; 1713 inventoryReply.InventoryData[0].Flags = item.Flags;
1716 inventoryReply.InventoryData[0].SalePrice = item.SalePrice; 1714 inventoryReply.InventoryData[0].SalePrice = item.SalePrice;
1717 inventoryReply.InventoryData[0].SaleType = item.SaleType; 1715 inventoryReply.InventoryData[0].SaleType = item.SaleType;
@@ -1763,10 +1761,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1763 bulkUpdate.ItemData[0].OwnerMask = item.CurrentPermissions; 1761 bulkUpdate.ItemData[0].OwnerMask = item.CurrentPermissions;
1764 bulkUpdate.ItemData[0].Type = (sbyte)item.AssetType; 1762 bulkUpdate.ItemData[0].Type = (sbyte)item.AssetType;
1765 1763
1766 //bulkUpdate.ItemData[0].GroupID = new UUID("00000000-0000-0000-0000-000000000000");
1767 bulkUpdate.ItemData[0].GroupID = item.GroupID; 1764 bulkUpdate.ItemData[0].GroupID = item.GroupID;
1768 bulkUpdate.ItemData[0].GroupOwned = item.GroupOwned; 1765 bulkUpdate.ItemData[0].GroupOwned = item.GroupOwned;
1769 bulkUpdate.ItemData[0].GroupMask = 0; 1766 bulkUpdate.ItemData[0].GroupMask = item.GroupPermissions;
1770 bulkUpdate.ItemData[0].Flags = item.Flags; 1767 bulkUpdate.ItemData[0].Flags = item.Flags;
1771 bulkUpdate.ItemData[0].SalePrice = item.SalePrice; 1768 bulkUpdate.ItemData[0].SalePrice = item.SalePrice;
1772 bulkUpdate.ItemData[0].SaleType = item.SaleType; 1769 bulkUpdate.ItemData[0].SaleType = item.SaleType;
@@ -1811,10 +1808,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1811 InventoryReply.InventoryData[0].OwnerMask = Item.CurrentPermissions; 1808 InventoryReply.InventoryData[0].OwnerMask = Item.CurrentPermissions;
1812 InventoryReply.InventoryData[0].Type = (sbyte)Item.AssetType; 1809 InventoryReply.InventoryData[0].Type = (sbyte)Item.AssetType;
1813 1810
1814 //InventoryReply.InventoryData[0].GroupID = new UUID("00000000-0000-0000-0000-000000000000");
1815 InventoryReply.InventoryData[0].GroupID = Item.GroupID; 1811 InventoryReply.InventoryData[0].GroupID = Item.GroupID;
1816 InventoryReply.InventoryData[0].GroupOwned = Item.GroupOwned; 1812 InventoryReply.InventoryData[0].GroupOwned = Item.GroupOwned;
1817 InventoryReply.InventoryData[0].GroupMask = 0; 1813 InventoryReply.InventoryData[0].GroupMask = Item.GroupPermissions;
1818 InventoryReply.InventoryData[0].Flags = Item.Flags; 1814 InventoryReply.InventoryData[0].Flags = Item.Flags;
1819 InventoryReply.InventoryData[0].SalePrice = Item.SalePrice; 1815 InventoryReply.InventoryData[0].SalePrice = Item.SalePrice;
1820 InventoryReply.InventoryData[0].SaleType = Item.SaleType; 1816 InventoryReply.InventoryData[0].SaleType = Item.SaleType;
@@ -5213,6 +5209,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5213 itemUpd.Description = Util.FieldToString(update.InventoryData[i].Description); 5209 itemUpd.Description = Util.FieldToString(update.InventoryData[i].Description);
5214 itemUpd.GroupID = update.InventoryData[i].GroupID; 5210 itemUpd.GroupID = update.InventoryData[i].GroupID;
5215 itemUpd.GroupOwned = update.InventoryData[i].GroupOwned; 5211 itemUpd.GroupOwned = update.InventoryData[i].GroupOwned;
5212 itemUpd.GroupPermissions = update.InventoryData[i].GroupMask;
5216 itemUpd.NextPermissions = update.InventoryData[i].NextOwnerMask; 5213 itemUpd.NextPermissions = update.InventoryData[i].NextOwnerMask;
5217 itemUpd.EveryOnePermissions = update.InventoryData[i].EveryoneMask; 5214 itemUpd.EveryOnePermissions = update.InventoryData[i].EveryoneMask;
5218 itemUpd.CreationDate = update.InventoryData[i].CreationDate; 5215 itemUpd.CreationDate = update.InventoryData[i].CreationDate;
@@ -5419,6 +5416,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5419 item.CurrentPermissions = rezScriptx.InventoryBlock.OwnerMask; 5416 item.CurrentPermissions = rezScriptx.InventoryBlock.OwnerMask;
5420 item.EveryOnePermissions = rezScriptx.InventoryBlock.EveryoneMask; 5417 item.EveryOnePermissions = rezScriptx.InventoryBlock.EveryoneMask;
5421 item.NextPermissions = rezScriptx.InventoryBlock.NextOwnerMask; 5418 item.NextPermissions = rezScriptx.InventoryBlock.NextOwnerMask;
5419 item.GroupPermissions = rezScriptx.InventoryBlock.GroupMask;
5422 item.GroupOwned = rezScriptx.InventoryBlock.GroupOwned; 5420 item.GroupOwned = rezScriptx.InventoryBlock.GroupOwned;
5423 item.GroupID = rezScriptx.InventoryBlock.GroupID; 5421 item.GroupID = rezScriptx.InventoryBlock.GroupID;
5424 item.AssetType = rezScriptx.InventoryBlock.Type; 5422 item.AssetType = rezScriptx.InventoryBlock.Type;