From b383a027dc59b5f1005122e9c5f26b99dd340d02 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 21 Feb 2024 15:58:05 +0000 Subject: [PATCH] cosmetics... --- .../Shared/Api/Implementation/LSL_Api.cs | 2 +- .../Shared/Api/Implementation/OSSL_Api.cs | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 28ef8d3edf..1e175cde63 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -4573,7 +4573,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } // check if destination is an object - if (World.GetSceneObjectPart(destId) is not null) + if (World.TryGetSceneObjectPart(destId, out _)) { // destination is an object World.MoveTaskInventoryItem(destId, m_host, item.ItemID); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 5a8414a49e..714e3c93b7 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -5652,11 +5652,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return; TaskInventoryItem item = part.Inventory.GetInventoryItem(inventory); - if (item == null || item.AssetID.IsZero()) + if (item is null) return; - // check if destination is an object - if (World.GetSceneObjectPart(destId) != null) + if (World.TryGetSceneObjectPart(destId, out _)) { // destination is an object World.MoveTaskInventoryItem(destId, part, item.ItemID); @@ -5677,7 +5676,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // destination is an avatar InventoryItemBase agentItem = World.MoveTaskInventoryItem(destId, UUID.Zero, part, item.ItemID, out string message); - if (agentItem == null) + if (agentItem is null) { m_LSL_Api.llSay(0, message); return; @@ -5694,12 +5693,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api agentItem.ID, true, m_host.AbsolutePosition, bucket, true); - if (World.TryGetScenePresence(destId, out ScenePresence sp)){ + if (World.TryGetScenePresence(destId, out ScenePresence sp)) sp.ControllingClient.SendInstantMessage(msg); - } - else{ + else m_TransferModule?.SendInstantMessage(msg, delegate(bool success) {}); - } + //This delay should only occur when giving inventory to avatars. ScriptSleep(3000); }