OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix coalesced objects not showing up as "piles" of prims (AVN only bug)

avinationmerge
Melanie Thielker 2014-07-20 00:17:35 +02:00
parent 9654b81b2d
commit 95f0d582a5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -1737,7 +1737,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
newBlock.CreationDate = item.CreationDate; newBlock.CreationDate = item.CreationDate;
newBlock.SalePrice = item.SalePrice; newBlock.SalePrice = item.SalePrice;
newBlock.SaleType = item.SaleType; newBlock.SaleType = item.SaleType;
newBlock.Flags = item.Flags & 0xff; newBlock.Flags = item.Flags & 0x2000ff;
newBlock.CRC = newBlock.CRC =
Helpers.InventoryCRC(newBlock.CreationDate, newBlock.SaleType, Helpers.InventoryCRC(newBlock.CreationDate, newBlock.SaleType,
@ -1991,7 +1991,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
itemBlock.GroupID = item.GroupID; itemBlock.GroupID = item.GroupID;
itemBlock.GroupOwned = item.GroupOwned; itemBlock.GroupOwned = item.GroupOwned;
itemBlock.GroupMask = item.GroupPermissions; itemBlock.GroupMask = item.GroupPermissions;
itemBlock.Flags = item.Flags & 0xff; itemBlock.Flags = item.Flags & 0x2000ff;
itemBlock.SalePrice = item.SalePrice; itemBlock.SalePrice = item.SalePrice;
itemBlock.SaleType = item.SaleType; itemBlock.SaleType = item.SaleType;
itemBlock.CreationDate = item.CreationDate; itemBlock.CreationDate = item.CreationDate;
@ -2058,7 +2058,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
bulkUpdate.ItemData[0].GroupID = item.GroupID; bulkUpdate.ItemData[0].GroupID = item.GroupID;
bulkUpdate.ItemData[0].GroupOwned = item.GroupOwned; bulkUpdate.ItemData[0].GroupOwned = item.GroupOwned;
bulkUpdate.ItemData[0].GroupMask = item.GroupPermissions; bulkUpdate.ItemData[0].GroupMask = item.GroupPermissions;
bulkUpdate.ItemData[0].Flags = item.Flags & 0xff; bulkUpdate.ItemData[0].Flags = item.Flags & 0x2000ff;
bulkUpdate.ItemData[0].SalePrice = item.SalePrice; bulkUpdate.ItemData[0].SalePrice = item.SalePrice;
bulkUpdate.ItemData[0].SaleType = item.SaleType; bulkUpdate.ItemData[0].SaleType = item.SaleType;
@ -2112,7 +2112,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
InventoryReply.InventoryData[0].GroupID = Item.GroupID; InventoryReply.InventoryData[0].GroupID = Item.GroupID;
InventoryReply.InventoryData[0].GroupOwned = Item.GroupOwned; InventoryReply.InventoryData[0].GroupOwned = Item.GroupOwned;
InventoryReply.InventoryData[0].GroupMask = Item.GroupPermissions; InventoryReply.InventoryData[0].GroupMask = Item.GroupPermissions;
InventoryReply.InventoryData[0].Flags = Item.Flags & 0xff; InventoryReply.InventoryData[0].Flags = Item.Flags & 0x2000ff;
InventoryReply.InventoryData[0].SalePrice = Item.SalePrice; InventoryReply.InventoryData[0].SalePrice = Item.SalePrice;
InventoryReply.InventoryData[0].SaleType = Item.SaleType; InventoryReply.InventoryData[0].SaleType = Item.SaleType;
InventoryReply.InventoryData[0].CreationDate = Item.CreationDate; InventoryReply.InventoryData[0].CreationDate = Item.CreationDate;