ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

more changes on task inventory offers

Browse Source
This commit is contained in:
UbitUmarov
2020-08-21 22:24:49 +01:00
parent a38624baab
commit fd49254708
9 changed files with 33 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2547,10 +2547,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
}
}
protected void SendBulkUpdateInventoryFolder(InventoryFolderBase folderBase)
protected void SendBulkUpdateInventoryFolder(InventoryFolderBase folderBase, UUID? transationID)
{
// We will use the same transaction id for all the separate packets to be sent out in this update.
UUID transactionId = UUID.Random();
UUID transactionId = transationID ?? UUID.Random();
List<BulkUpdateInventoryPacket.FolderDataBlock> folderDataBlocks
= new List<BulkUpdateInventoryPacket.FolderDataBlock>();
@@ -2697,19 +2697,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
return itemBlock;
}
public void SendBulkUpdateInventory(InventoryNodeBase node)
public void SendBulkUpdateInventory(InventoryNodeBase node, UUID? transationID = null)
{
if (node is InventoryItemBase)
SendBulkUpdateInventoryItem((InventoryItemBase)node);
SendBulkUpdateInventoryItem((InventoryItemBase)node, transationID);
else if (node is InventoryFolderBase)
SendBulkUpdateInventoryFolder((InventoryFolderBase)node);
SendBulkUpdateInventoryFolder((InventoryFolderBase)node, transationID);
else if (node != null)
m_log.ErrorFormat("[CLIENT]: {0} sent unknown inventory node named {1}", Name, node.Name);
else
m_log.ErrorFormat("[CLIENT]: {0} sent null inventory node", Name);
}
protected void SendBulkUpdateInventoryItem(InventoryItemBase item)
protected void SendBulkUpdateInventoryItem(InventoryItemBase item, UUID? transationID = null)
{
const uint FULL_MASK_PERMISSIONS = (uint)0x7ffffff;
@@ -2717,7 +2717,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
= (BulkUpdateInventoryPacket)PacketPool.Instance.GetPacket(PacketType.BulkUpdateInventory);
bulkUpdate.AgentData.AgentID = AgentId;
bulkUpdate.AgentData.TransactionID = UUID.Random();
bulkUpdate.AgentData.TransactionID = transationID ?? UUID.Random();
bulkUpdate.FolderData = new BulkUpdateInventoryPacket.FolderDataBlock[1];
bulkUpdate.FolderData[0] = new BulkUpdateInventoryPacket.FolderDataBlock();