From 8f5b40b35a7a7a4bc4fa72db56135b3a60445daa Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 24 Jul 2021 22:02:24 +0100 Subject: [PATCH] right name is UpdateInventoryItem not UpdateInventoryItemAsset (at those locations) --- OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 2 +- OpenSim/Region/Framework/Scenes/Scene.cs | 4 ++-- OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs | 2 +- OpenSim/Tests/Permissions/Common.cs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 9cd7155890..cb7eea61d3 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs @@ -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( diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 2624fd1cbc..f4d006b2c3 100755 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -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; diff --git a/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs index 58e157cfb8..514e4970f1 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs @@ -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; diff --git a/OpenSim/Tests/Permissions/Common.cs b/OpenSim/Tests/Permissions/Common.cs index 99722d8940..90a3dce1b3 100644 --- a/OpenSim/Tests/Permissions/Common.cs +++ b/OpenSim/Tests/Permissions/Common.cs @@ -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);