add missing transactionID in SendInventoryItemCreateUpdate. and make use
of it on inventoryAccessModule, etc. Most likelly it's needs where there is a transactionID not zeroavinationmerge
parent
ca9d3760ab
commit
ca67ee60ac
|
@ -1158,6 +1158,7 @@ namespace OpenSim.Framework
|
|||
/// </summary>
|
||||
/// <param name="Item"></param>
|
||||
void SendInventoryItemCreateUpdate(InventoryItemBase Item, uint callbackId);
|
||||
void SendInventoryItemCreateUpdate(InventoryItemBase Item, UUID transactionID, uint callbackId);
|
||||
|
||||
void SendRemoveInventoryItem(UUID itemID);
|
||||
|
||||
|
|
|
@ -2067,8 +2067,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
OutPacket(bulkUpdate, ThrottleOutPacketType.Asset);
|
||||
}
|
||||
|
||||
/// <see>IClientAPI.SendInventoryItemCreateUpdate(InventoryItemBase)</see>
|
||||
public void SendInventoryItemCreateUpdate(InventoryItemBase Item, uint callbackId)
|
||||
{
|
||||
SendInventoryItemCreateUpdate(Item, UUID.Zero, callbackId);
|
||||
}
|
||||
|
||||
/// <see>IClientAPI.SendInventoryItemCreateUpdate(InventoryItemBase)</see>
|
||||
public void SendInventoryItemCreateUpdate(InventoryItemBase Item, UUID transactionID, uint callbackId)
|
||||
{
|
||||
const uint FULL_MASK_PERMISSIONS = (uint)PermissionMask.All;
|
||||
|
||||
|
@ -2079,6 +2084,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
// TODO: don't create new blocks if recycling an old packet
|
||||
InventoryReply.AgentData.AgentID = AgentId;
|
||||
InventoryReply.AgentData.SimApproved = true;
|
||||
InventoryReply.AgentData.TransactionID = transactionID;
|
||||
InventoryReply.InventoryData = new UpdateCreateInventoryItemPacket.InventoryDataBlock[1];
|
||||
InventoryReply.InventoryData[0] = new UpdateCreateInventoryItemPacket.InventoryDataBlock();
|
||||
InventoryReply.InventoryData[0].ItemID = Item.ID;
|
||||
|
|
|
@ -216,7 +216,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
|
|||
m_Scene.AssetService.Store(asset);
|
||||
m_Scene.CreateNewInventoryItem(
|
||||
remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID,
|
||||
name, description, 0, callbackID, asset, invType, nextOwnerMask, creationDate);
|
||||
name, description, 0, callbackID, asset, invType, nextOwnerMask, creationDate,transactionID);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -904,11 +904,22 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
public void CreateNewInventoryItem(
|
||||
IClientAPI remoteClient, string creatorID, string creatorData, UUID folderID,
|
||||
string name, string description, uint flags, uint callbackID,
|
||||
AssetBase asset, sbyte invType, uint nextOwnerMask, int creationDate)
|
||||
AssetBase asset, sbyte invType, uint nextOwnerMask, int creationDate, UUID transationID)
|
||||
{
|
||||
CreateNewInventoryItem(
|
||||
remoteClient, creatorID, creatorData, folderID, name, description, flags, callbackID, asset, invType,
|
||||
(uint)PermissionMask.All, (uint)PermissionMask.All, 0, nextOwnerMask, 0, creationDate);
|
||||
(uint)PermissionMask.All, (uint)PermissionMask.All, 0, nextOwnerMask, 0, creationDate, transationID);
|
||||
}
|
||||
|
||||
|
||||
private void CreateNewInventoryItem(
|
||||
IClientAPI remoteClient, string creatorID, string creatorData, UUID folderID,
|
||||
string name, string description, uint flags, uint callbackID, AssetBase asset, sbyte invType,
|
||||
uint baseMask, uint currentMask, uint everyoneMask, uint nextOwnerMask, uint groupMask, int creationDate)
|
||||
{
|
||||
CreateNewInventoryItem(remoteClient, creatorID, creatorData, folderID,
|
||||
name, description, flags, callbackID, asset, invType,
|
||||
baseMask, currentMask, everyoneMask, nextOwnerMask, groupMask, creationDate, UUID.Zero);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
@ -933,7 +944,7 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
private void CreateNewInventoryItem(
|
||||
IClientAPI remoteClient, string creatorID, string creatorData, UUID folderID,
|
||||
string name, string description, uint flags, uint callbackID, AssetBase asset, sbyte invType,
|
||||
uint baseMask, uint currentMask, uint everyoneMask, uint nextOwnerMask, uint groupMask, int creationDate)
|
||||
uint baseMask, uint currentMask, uint everyoneMask, uint nextOwnerMask, uint groupMask, int creationDate,UUID transationID)
|
||||
{
|
||||
InventoryItemBase item = new InventoryItemBase();
|
||||
item.Owner = remoteClient.AgentId;
|
||||
|
@ -956,7 +967,7 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
|
||||
if (AddInventoryItem(item))
|
||||
{
|
||||
remoteClient.SendInventoryItemCreateUpdate(item, callbackID);
|
||||
remoteClient.SendInventoryItemCreateUpdate(item, transationID, callbackID);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -1100,7 +1100,12 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
|
|||
|
||||
public void SendInventoryItemCreateUpdate(InventoryItemBase Item, uint callbackId)
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
public void SendInventoryItemCreateUpdate(InventoryItemBase Item, UUID transactionID, uint callbackId)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public void SendRemoveInventoryItem(UUID itemID)
|
||||
|
|
|
@ -739,6 +739,10 @@ namespace OpenSim.Region.OptionalModules.World.NPC
|
|||
{
|
||||
}
|
||||
|
||||
public void SendInventoryItemCreateUpdate(InventoryItemBase Item, UUID transactionID, uint callbackId)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void SendRemoveInventoryItem(UUID itemID)
|
||||
{
|
||||
}
|
||||
|
|
|
@ -716,6 +716,10 @@ namespace OpenSim.Tests.Common.Mock
|
|||
{
|
||||
}
|
||||
|
||||
public void SendInventoryItemCreateUpdate(InventoryItemBase Item, UUID transactionID, uint callbackId)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void SendRemoveInventoryItem(UUID itemID)
|
||||
{
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue