From 8c21b30a51ff002b91ef843fefbdb00e090a95df Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Mon, 16 Dec 2019 01:27:49 +0000 Subject: [PATCH] do dispatch RequestLure ims --- OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs | 6 ++++++ OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs | 5 +++++ OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs index 10781e90c5..8aab90ad32 100644 --- a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs @@ -150,6 +150,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure void OnInstantMessage(IClientAPI client, GridInstantMessage im) { + if (im.dialog == (byte)InstantMessageDialog.RequestLure) + { + if (m_TransferModule != null) + m_TransferModule.SendInstantMessage(im, delegate (bool success) { }); + } } void OnIncomingInstantMessage(GridInstantMessage im) @@ -170,6 +175,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure if (m_TransferModule != null) m_TransferModule.SendInstantMessage(im, delegate(bool success) { }); } + } public void OnStartLure(byte lureType, string message, UUID targetid, IClientAPI client) diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs index 6f79676f0c..160a53eb74 100644 --- a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs @@ -143,6 +143,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure public void OnInstantMessage(IClientAPI client, GridInstantMessage im) { + if (im.dialog == (byte)InstantMessageDialog.RequestLure) + { + if (m_TransferModule != null) + m_TransferModule.SendInstantMessage(im, delegate (bool success) { }); + } } public void OnStartLure(byte lureType, string message, UUID targetid, IClientAPI client) diff --git a/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs b/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs index a450dd6e40..b73e34637e 100644 --- a/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs +++ b/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs @@ -82,7 +82,7 @@ namespace OpenSim.Region.CoreModules.World m_rndnums = new Random(seed); GenerateCloudCover(); - m_dataVersion = (int)m_scene.AllocateLocalId(); + m_dataVersion = m_scene.AllocateIntId(); scene.EventManager.OnNewClient += CloudsToClient; scene.EventManager.OnFrame += CloudUpdate;