diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 12 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index ef1d803..c78d552 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -1741,7 +1741,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1741 | newBlock.CreationDate = item.CreationDate; | 1741 | newBlock.CreationDate = item.CreationDate; |
1742 | newBlock.SalePrice = item.SalePrice; | 1742 | newBlock.SalePrice = item.SalePrice; |
1743 | newBlock.SaleType = item.SaleType; | 1743 | newBlock.SaleType = item.SaleType; |
1744 | newBlock.Flags = item.Flags; | 1744 | newBlock.Flags = item.Flags & 0xff; |
1745 | 1745 | ||
1746 | newBlock.CRC = | 1746 | newBlock.CRC = |
1747 | Helpers.InventoryCRC(newBlock.CreationDate, newBlock.SaleType, | 1747 | Helpers.InventoryCRC(newBlock.CreationDate, newBlock.SaleType, |
@@ -1995,7 +1995,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1995 | itemBlock.GroupID = item.GroupID; | 1995 | itemBlock.GroupID = item.GroupID; |
1996 | itemBlock.GroupOwned = item.GroupOwned; | 1996 | itemBlock.GroupOwned = item.GroupOwned; |
1997 | itemBlock.GroupMask = item.GroupPermissions; | 1997 | itemBlock.GroupMask = item.GroupPermissions; |
1998 | itemBlock.Flags = item.Flags; | 1998 | itemBlock.Flags = item.Flags & 0xff; |
1999 | itemBlock.SalePrice = item.SalePrice; | 1999 | itemBlock.SalePrice = item.SalePrice; |
2000 | itemBlock.SaleType = item.SaleType; | 2000 | itemBlock.SaleType = item.SaleType; |
2001 | itemBlock.CreationDate = item.CreationDate; | 2001 | itemBlock.CreationDate = item.CreationDate; |
@@ -2062,7 +2062,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2062 | bulkUpdate.ItemData[0].GroupID = item.GroupID; | 2062 | bulkUpdate.ItemData[0].GroupID = item.GroupID; |
2063 | bulkUpdate.ItemData[0].GroupOwned = item.GroupOwned; | 2063 | bulkUpdate.ItemData[0].GroupOwned = item.GroupOwned; |
2064 | bulkUpdate.ItemData[0].GroupMask = item.GroupPermissions; | 2064 | bulkUpdate.ItemData[0].GroupMask = item.GroupPermissions; |
2065 | bulkUpdate.ItemData[0].Flags = item.Flags; | 2065 | bulkUpdate.ItemData[0].Flags = item.Flags & 0xff; |
2066 | bulkUpdate.ItemData[0].SalePrice = item.SalePrice; | 2066 | bulkUpdate.ItemData[0].SalePrice = item.SalePrice; |
2067 | bulkUpdate.ItemData[0].SaleType = item.SaleType; | 2067 | bulkUpdate.ItemData[0].SaleType = item.SaleType; |
2068 | 2068 | ||
@@ -2116,7 +2116,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2116 | InventoryReply.InventoryData[0].GroupID = Item.GroupID; | 2116 | InventoryReply.InventoryData[0].GroupID = Item.GroupID; |
2117 | InventoryReply.InventoryData[0].GroupOwned = Item.GroupOwned; | 2117 | InventoryReply.InventoryData[0].GroupOwned = Item.GroupOwned; |
2118 | InventoryReply.InventoryData[0].GroupMask = Item.GroupPermissions; | 2118 | InventoryReply.InventoryData[0].GroupMask = Item.GroupPermissions; |
2119 | InventoryReply.InventoryData[0].Flags = Item.Flags; | 2119 | InventoryReply.InventoryData[0].Flags = Item.Flags & 0xff; |
2120 | InventoryReply.InventoryData[0].SalePrice = Item.SalePrice; | 2120 | InventoryReply.InventoryData[0].SalePrice = Item.SalePrice; |
2121 | InventoryReply.InventoryData[0].SaleType = Item.SaleType; | 2121 | InventoryReply.InventoryData[0].SaleType = Item.SaleType; |
2122 | InventoryReply.InventoryData[0].CreationDate = Item.CreationDate; | 2122 | InventoryReply.InventoryData[0].CreationDate = Item.CreationDate; |
@@ -5137,6 +5137,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5137 | 5137 | ||
5138 | data.CollisionPlane.ToBytes(objectData, 0); | 5138 | data.CollisionPlane.ToBytes(objectData, 0); |
5139 | offsetPosition.ToBytes(objectData, 16); | 5139 | offsetPosition.ToBytes(objectData, 16); |
5140 | Vector3 velocity = new Vector3(0, 0, 0); | ||
5141 | Vector3 acceleration = new Vector3(0, 0, 0); | ||
5142 | velocity.ToBytes(objectData, 28); | ||
5143 | acceleration.ToBytes(objectData, 40); | ||
5140 | // data.Velocity.ToBytes(objectData, 28); | 5144 | // data.Velocity.ToBytes(objectData, 28); |
5141 | // data.Acceleration.ToBytes(objectData, 40); | 5145 | // data.Acceleration.ToBytes(objectData, 40); |
5142 | rotation.ToBytes(objectData, 52); | 5146 | rotation.ToBytes(objectData, 52); |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index fab66ce..d008702 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||
@@ -1135,7 +1135,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1135 | 1135 | ||
1136 | if (!udpClient.IsConnected) | 1136 | if (!udpClient.IsConnected) |
1137 | { | 1137 | { |
1138 | // m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet for a unConnected client in " + m_scene.RegionInfo.RegionName); | 1138 | m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet for a unConnected client in " + m_scene.RegionInfo.RegionName); |
1139 | return; | 1139 | return; |
1140 | } | 1140 | } |
1141 | 1141 | ||