diff options
author | Melanie | 2013-05-31 22:02:31 +0200 |
---|---|---|
committer | Melanie | 2013-05-31 22:02:31 +0200 |
commit | 9589a09eda2a08c12dc54a99fb04faa18e5c6de7 (patch) | |
tree | 5992b02981df6164063d9701e884549c7dc14f0c /OpenSim | |
parent | Stop sending velocity to avoid snap-back (diff) | |
download | opensim-SC_OLD-9589a09eda2a08c12dc54a99fb04faa18e5c6de7.zip opensim-SC_OLD-9589a09eda2a08c12dc54a99fb04faa18e5c6de7.tar.gz opensim-SC_OLD-9589a09eda2a08c12dc54a99fb04faa18e5c6de7.tar.bz2 opensim-SC_OLD-9589a09eda2a08c12dc54a99fb04faa18e5c6de7.tar.xz |
Fix multi-wear of alpha and tattoo layers.
Diffstat (limited to 'OpenSim')
3 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs b/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs index c0ca1e1..c305797 100644 --- a/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs +++ b/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs | |||
@@ -97,7 +97,7 @@ namespace OpenSim.Capabilities.Handlers | |||
97 | llsdItem.asset_id = invItem.AssetID; | 97 | llsdItem.asset_id = invItem.AssetID; |
98 | llsdItem.created_at = invItem.CreationDate; | 98 | llsdItem.created_at = invItem.CreationDate; |
99 | llsdItem.desc = invItem.Description; | 99 | llsdItem.desc = invItem.Description; |
100 | llsdItem.flags = (int)invItem.Flags; | 100 | llsdItem.flags = ((int)invItem.Flags) & 0xff; |
101 | llsdItem.item_id = invItem.ID; | 101 | llsdItem.item_id = invItem.ID; |
102 | llsdItem.name = invItem.Name; | 102 | llsdItem.name = invItem.Name; |
103 | llsdItem.parent_id = invItem.Folder; | 103 | llsdItem.parent_id = invItem.Folder; |
diff --git a/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs b/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs index 11a2698..16e2f2d 100644 --- a/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs +++ b/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs | |||
@@ -411,7 +411,7 @@ namespace OpenSim.Capabilities.Handlers | |||
411 | llsdItem.asset_id = invItem.AssetID; | 411 | llsdItem.asset_id = invItem.AssetID; |
412 | llsdItem.created_at = invItem.CreationDate; | 412 | llsdItem.created_at = invItem.CreationDate; |
413 | llsdItem.desc = invItem.Description; | 413 | llsdItem.desc = invItem.Description; |
414 | llsdItem.flags = (int)invItem.Flags; | 414 | llsdItem.flags = ((int)invItem.Flags) & 0xff; |
415 | llsdItem.item_id = invItem.ID; | 415 | llsdItem.item_id = invItem.ID; |
416 | llsdItem.name = invItem.Name; | 416 | llsdItem.name = invItem.Name; |
417 | llsdItem.parent_id = invItem.Folder; | 417 | llsdItem.parent_id = invItem.Folder; |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 7208f08..eebb8ae 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; | 1740 | newBlock.Flags = item.Flags & 0xff; |
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; | 1994 | itemBlock.Flags = item.Flags & 0xff; |
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; | 2061 | bulkUpdate.ItemData[0].Flags = item.Flags & 0xff; |
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; | 2115 | InventoryReply.InventoryData[0].Flags = Item.Flags & 0xff; |
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; |