diff options
author | UbitUmarov | 2012-09-24 21:22:08 +0100 |
---|---|---|
committer | UbitUmarov | 2012-09-24 21:22:08 +0100 |
commit | ca67ee60ac0e0c26d6d32fc68d48ef63570f034d (patch) | |
tree | e87d8623aa44927b220e783d7265a50af10b295f /OpenSim/Region/ClientStack/Linden | |
parent | Merge branch 'ubitwork' into avination (diff) | |
download | opensim-SC-ca67ee60ac0e0c26d6d32fc68d48ef63570f034d.zip opensim-SC-ca67ee60ac0e0c26d6d32fc68d48ef63570f034d.tar.gz opensim-SC-ca67ee60ac0e0c26d6d32fc68d48ef63570f034d.tar.bz2 opensim-SC-ca67ee60ac0e0c26d6d32fc68d48ef63570f034d.tar.xz |
add missing transactionID in SendInventoryItemCreateUpdate. and make use
of it on inventoryAccessModule, etc. Most likelly it's needs where there
is a transactionID not zero
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 7749ef3..ee28914 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -2067,9 +2067,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2067 | OutPacket(bulkUpdate, ThrottleOutPacketType.Asset); | 2067 | OutPacket(bulkUpdate, ThrottleOutPacketType.Asset); |
2068 | } | 2068 | } |
2069 | 2069 | ||
2070 | /// <see>IClientAPI.SendInventoryItemCreateUpdate(InventoryItemBase)</see> | ||
2071 | public void SendInventoryItemCreateUpdate(InventoryItemBase Item, uint callbackId) | 2070 | public void SendInventoryItemCreateUpdate(InventoryItemBase Item, uint callbackId) |
2072 | { | 2071 | { |
2072 | SendInventoryItemCreateUpdate(Item, UUID.Zero, callbackId); | ||
2073 | } | ||
2074 | |||
2075 | /// <see>IClientAPI.SendInventoryItemCreateUpdate(InventoryItemBase)</see> | ||
2076 | public void SendInventoryItemCreateUpdate(InventoryItemBase Item, UUID transactionID, uint callbackId) | ||
2077 | { | ||
2073 | const uint FULL_MASK_PERMISSIONS = (uint)PermissionMask.All; | 2078 | const uint FULL_MASK_PERMISSIONS = (uint)PermissionMask.All; |
2074 | 2079 | ||
2075 | UpdateCreateInventoryItemPacket InventoryReply | 2080 | UpdateCreateInventoryItemPacket InventoryReply |
@@ -2079,6 +2084,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2079 | // TODO: don't create new blocks if recycling an old packet | 2084 | // TODO: don't create new blocks if recycling an old packet |
2080 | InventoryReply.AgentData.AgentID = AgentId; | 2085 | InventoryReply.AgentData.AgentID = AgentId; |
2081 | InventoryReply.AgentData.SimApproved = true; | 2086 | InventoryReply.AgentData.SimApproved = true; |
2087 | InventoryReply.AgentData.TransactionID = transactionID; | ||
2082 | InventoryReply.InventoryData = new UpdateCreateInventoryItemPacket.InventoryDataBlock[1]; | 2088 | InventoryReply.InventoryData = new UpdateCreateInventoryItemPacket.InventoryDataBlock[1]; |
2083 | InventoryReply.InventoryData[0] = new UpdateCreateInventoryItemPacket.InventoryDataBlock(); | 2089 | InventoryReply.InventoryData[0] = new UpdateCreateInventoryItemPacket.InventoryDataBlock(); |
2084 | InventoryReply.InventoryData[0].ItemID = Item.ID; | 2090 | InventoryReply.InventoryData[0].ItemID = Item.ID; |