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

right name is UpdateInventoryItem not UpdateInventoryItemAsset (at those locations)

Browse Source
This commit is contained in:
UbitUmarov
2021-07-24 22:02:24 +01:00
parent 547ac80a19
commit 8f5b40b35a
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@@ -465,7 +465,7 @@ namespace OpenSim.Region.Framework.Scenes
/* public void UpdateInventoryItemAsset(IClientAPI remoteClient, UUID transactionID,
UUID itemID, string name, string description,
uint nextOwnerMask)*/
public void UpdateInventoryItemAsset(IClientAPI remoteClient, UUID transactionID,
public void UpdateInventoryItem(IClientAPI remoteClient, UUID transactionID,
UUID itemID, InventoryItemBase itemUpd)
{
// m_log.DebugFormat(

4
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -3436,7 +3436,7 @@ namespace OpenSim.Region.Framework.Scenes
client.OnFetchInventoryDescendents += HandleFetchInventoryDescendents;
client.OnPurgeInventoryDescendents += HandlePurgeInventoryDescendents; // 2; //!!
client.OnFetchInventory += m_asyncInventorySender.HandleFetchInventory;
client.OnUpdateInventoryItem += UpdateInventoryItemAsset;
client.OnUpdateInventoryItem += UpdateInventoryItem;
client.OnCopyInventoryItem += CopyInventoryItem;
client.OnMoveItemsAndLeaveCopy += MoveInventoryItemsLeaveCopy;
client.OnMoveInventoryItem += MoveInventoryItem;
@@ -3561,7 +3561,7 @@ namespace OpenSim.Region.Framework.Scenes
client.OnFetchInventoryDescendents -= HandleFetchInventoryDescendents;
client.OnPurgeInventoryDescendents -= HandlePurgeInventoryDescendents; // 2; //!!
client.OnFetchInventory -= m_asyncInventorySender.HandleFetchInventory;
client.OnUpdateInventoryItem -= UpdateInventoryItemAsset;
client.OnUpdateInventoryItem -= UpdateInventoryItem;
client.OnCopyInventoryItem -= CopyInventoryItem;
client.OnMoveInventoryItem -= MoveInventoryItem;
client.OnRemoveInventoryItem -= RemoveInventoryItem;

2
OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
View File

@@ -155,7 +155,7 @@ namespace OpenSim.Region.Framework.Tests
InventoryItemBase item1 = UserInventoryHelpers.CreateInventoryItem(scene, "SomeObject", user1.PrincipalID, InventoryType.Object);
// Set All perms in inventory
item1.NextPermissions = (uint)OpenMetaverse.PermissionMask.All;
scene.UpdateInventoryItemAsset(sp1.ControllingClient, UUID.Zero, item1.ID, item1);
scene.UpdateInventoryItem(sp1.ControllingClient, UUID.Zero, item1.ID, item1);
//Assert.That((item1.NextPermissions & (uint)OpenMetaverse.PermissionMask.All) == (uint)OpenMetaverse.PermissionMask.All);
string message;

2
OpenSim/Tests/Permissions/Common.cs
View File

@@ -191,7 +191,7 @@ namespace OpenSim.Tests.Permissions
Assert.That(clone.ID == item.ID);
// Update properties of the item in inventory. This should affect the original item above.
Common.TheScene.UpdateInventoryItemAsset(m_Avatars[ownerIndex].ControllingClient, UUID.Zero, clone.ID, clone);
Common.TheScene.UpdateInventoryItem(m_Avatars[ownerIndex].ControllingClient, UUID.Zero, clone.ID, clone);
item = Common.TheInstance.GetItemFromInventory(m_Avatars[ownerIndex].UUID, "Objects", name);
Assert.That(item, Is.Not.Null);