aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorMelanie Thielker2014-07-20 00:17:35 +0200
committerMelanie Thielker2014-07-20 00:18:28 +0200
commit95f0d582a51ed91c24e03ea2c16d87ac3f416a22 (patch)
treec1a8d20d7f64382d83ce84da38766357ed5b56be /OpenSim/Region/ClientStack
parentrevert to capsule representation of avatar collider (diff)
downloadopensim-SC-95f0d582a51ed91c24e03ea2c16d87ac3f416a22.zip
opensim-SC-95f0d582a51ed91c24e03ea2c16d87ac3f416a22.tar.gz
opensim-SC-95f0d582a51ed91c24e03ea2c16d87ac3f416a22.tar.bz2
opensim-SC-95f0d582a51ed91c24e03ea2c16d87ac3f416a22.tar.xz
Fix coalesced objects not showing up as "piles" of prims (AVN only bug)
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 7c62f90..5ee1596 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -1737,7 +1737,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1737 newBlock.CreationDate = item.CreationDate; 1737 newBlock.CreationDate = item.CreationDate;
1738 newBlock.SalePrice = item.SalePrice; 1738 newBlock.SalePrice = item.SalePrice;
1739 newBlock.SaleType = item.SaleType; 1739 newBlock.SaleType = item.SaleType;
1740 newBlock.Flags = item.Flags & 0xff; 1740 newBlock.Flags = item.Flags & 0x2000ff;
1741 1741
1742 newBlock.CRC = 1742 newBlock.CRC =
1743 Helpers.InventoryCRC(newBlock.CreationDate, newBlock.SaleType, 1743 Helpers.InventoryCRC(newBlock.CreationDate, newBlock.SaleType,
@@ -1991,7 +1991,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1991 itemBlock.GroupID = item.GroupID; 1991 itemBlock.GroupID = item.GroupID;
1992 itemBlock.GroupOwned = item.GroupOwned; 1992 itemBlock.GroupOwned = item.GroupOwned;
1993 itemBlock.GroupMask = item.GroupPermissions; 1993 itemBlock.GroupMask = item.GroupPermissions;
1994 itemBlock.Flags = item.Flags & 0xff; 1994 itemBlock.Flags = item.Flags & 0x2000ff;
1995 itemBlock.SalePrice = item.SalePrice; 1995 itemBlock.SalePrice = item.SalePrice;
1996 itemBlock.SaleType = item.SaleType; 1996 itemBlock.SaleType = item.SaleType;
1997 itemBlock.CreationDate = item.CreationDate; 1997 itemBlock.CreationDate = item.CreationDate;
@@ -2058,7 +2058,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2058 bulkUpdate.ItemData[0].GroupID = item.GroupID; 2058 bulkUpdate.ItemData[0].GroupID = item.GroupID;
2059 bulkUpdate.ItemData[0].GroupOwned = item.GroupOwned; 2059 bulkUpdate.ItemData[0].GroupOwned = item.GroupOwned;
2060 bulkUpdate.ItemData[0].GroupMask = item.GroupPermissions; 2060 bulkUpdate.ItemData[0].GroupMask = item.GroupPermissions;
2061 bulkUpdate.ItemData[0].Flags = item.Flags & 0xff; 2061 bulkUpdate.ItemData[0].Flags = item.Flags & 0x2000ff;
2062 bulkUpdate.ItemData[0].SalePrice = item.SalePrice; 2062 bulkUpdate.ItemData[0].SalePrice = item.SalePrice;
2063 bulkUpdate.ItemData[0].SaleType = item.SaleType; 2063 bulkUpdate.ItemData[0].SaleType = item.SaleType;
2064 2064
@@ -2112,7 +2112,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2112 InventoryReply.InventoryData[0].GroupID = Item.GroupID; 2112 InventoryReply.InventoryData[0].GroupID = Item.GroupID;
2113 InventoryReply.InventoryData[0].GroupOwned = Item.GroupOwned; 2113 InventoryReply.InventoryData[0].GroupOwned = Item.GroupOwned;
2114 InventoryReply.InventoryData[0].GroupMask = Item.GroupPermissions; 2114 InventoryReply.InventoryData[0].GroupMask = Item.GroupPermissions;
2115 InventoryReply.InventoryData[0].Flags = Item.Flags & 0xff; 2115 InventoryReply.InventoryData[0].Flags = Item.Flags & 0x2000ff;
2116 InventoryReply.InventoryData[0].SalePrice = Item.SalePrice; 2116 InventoryReply.InventoryData[0].SalePrice = Item.SalePrice;
2117 InventoryReply.InventoryData[0].SaleType = Item.SaleType; 2117 InventoryReply.InventoryData[0].SaleType = Item.SaleType;
2118 InventoryReply.InventoryData[0].CreationDate = Item.CreationDate; 2118 InventoryReply.InventoryData[0].CreationDate = Item.CreationDate;