diff options
author | Melanie Thielker | 2014-07-20 00:17:35 +0200 |
---|---|---|
committer | Melanie Thielker | 2014-07-20 00:17:35 +0200 |
commit | 5000a5c038ddc2a8d5cd8cd46e9dcb9a0845faae (patch) | |
tree | 62f04c7f9819281861367af6a39ebbed1c220ca9 /OpenSim/Region/ClientStack/Linden | |
parent | Merge branch 'ubitworkmaster' (diff) | |
download | opensim-SC_OLD-5000a5c038ddc2a8d5cd8cd46e9dcb9a0845faae.zip opensim-SC_OLD-5000a5c038ddc2a8d5cd8cd46e9dcb9a0845faae.tar.gz opensim-SC_OLD-5000a5c038ddc2a8d5cd8cd46e9dcb9a0845faae.tar.bz2 opensim-SC_OLD-5000a5c038ddc2a8d5cd8cd46e9dcb9a0845faae.tar.xz |
Fix coalesced objects not showing up as "piles" of prims (AVN only bug)
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 8 |
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 f599342..b4a0a98 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -1794,7 +1794,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1794 | newBlock.CreationDate = item.CreationDate; | 1794 | newBlock.CreationDate = item.CreationDate; |
1795 | newBlock.SalePrice = item.SalePrice; | 1795 | newBlock.SalePrice = item.SalePrice; |
1796 | newBlock.SaleType = item.SaleType; | 1796 | newBlock.SaleType = item.SaleType; |
1797 | newBlock.Flags = item.Flags & 0xff; | 1797 | newBlock.Flags = item.Flags & 0x2000ff; |
1798 | 1798 | ||
1799 | newBlock.CRC = | 1799 | newBlock.CRC = |
1800 | Helpers.InventoryCRC(newBlock.CreationDate, newBlock.SaleType, | 1800 | Helpers.InventoryCRC(newBlock.CreationDate, newBlock.SaleType, |
@@ -2048,7 +2048,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2048 | itemBlock.GroupID = item.GroupID; | 2048 | itemBlock.GroupID = item.GroupID; |
2049 | itemBlock.GroupOwned = item.GroupOwned; | 2049 | itemBlock.GroupOwned = item.GroupOwned; |
2050 | itemBlock.GroupMask = item.GroupPermissions; | 2050 | itemBlock.GroupMask = item.GroupPermissions; |
2051 | itemBlock.Flags = item.Flags & 0xff; | 2051 | itemBlock.Flags = item.Flags & 0x2000ff; |
2052 | itemBlock.SalePrice = item.SalePrice; | 2052 | itemBlock.SalePrice = item.SalePrice; |
2053 | itemBlock.SaleType = item.SaleType; | 2053 | itemBlock.SaleType = item.SaleType; |
2054 | itemBlock.CreationDate = item.CreationDate; | 2054 | itemBlock.CreationDate = item.CreationDate; |
@@ -2115,7 +2115,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2115 | bulkUpdate.ItemData[0].GroupID = item.GroupID; | 2115 | bulkUpdate.ItemData[0].GroupID = item.GroupID; |
2116 | bulkUpdate.ItemData[0].GroupOwned = item.GroupOwned; | 2116 | bulkUpdate.ItemData[0].GroupOwned = item.GroupOwned; |
2117 | bulkUpdate.ItemData[0].GroupMask = item.GroupPermissions; | 2117 | bulkUpdate.ItemData[0].GroupMask = item.GroupPermissions; |
2118 | bulkUpdate.ItemData[0].Flags = item.Flags & 0xff; | 2118 | bulkUpdate.ItemData[0].Flags = item.Flags & 0x2000ff; |
2119 | bulkUpdate.ItemData[0].SalePrice = item.SalePrice; | 2119 | bulkUpdate.ItemData[0].SalePrice = item.SalePrice; |
2120 | bulkUpdate.ItemData[0].SaleType = item.SaleType; | 2120 | bulkUpdate.ItemData[0].SaleType = item.SaleType; |
2121 | 2121 | ||
@@ -2169,7 +2169,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2169 | InventoryReply.InventoryData[0].GroupID = Item.GroupID; | 2169 | InventoryReply.InventoryData[0].GroupID = Item.GroupID; |
2170 | InventoryReply.InventoryData[0].GroupOwned = Item.GroupOwned; | 2170 | InventoryReply.InventoryData[0].GroupOwned = Item.GroupOwned; |
2171 | InventoryReply.InventoryData[0].GroupMask = Item.GroupPermissions; | 2171 | InventoryReply.InventoryData[0].GroupMask = Item.GroupPermissions; |
2172 | InventoryReply.InventoryData[0].Flags = Item.Flags & 0xff; | 2172 | InventoryReply.InventoryData[0].Flags = Item.Flags & 0x2000ff; |
2173 | InventoryReply.InventoryData[0].SalePrice = Item.SalePrice; | 2173 | InventoryReply.InventoryData[0].SalePrice = Item.SalePrice; |
2174 | InventoryReply.InventoryData[0].SaleType = Item.SaleType; | 2174 | InventoryReply.InventoryData[0].SaleType = Item.SaleType; |
2175 | InventoryReply.InventoryData[0].CreationDate = Item.CreationDate; | 2175 | InventoryReply.InventoryData[0].CreationDate = Item.CreationDate; |