aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2019-12-16 01:27:49 +0000
committerUbitUmarov2019-12-16 01:27:49 +0000
commit8c21b30a51ff002b91ef843fefbdb00e090a95df (patch)
tree25a050653a0fa861e5f984d016ce761d09446b73
parentadd a formal lock object (diff)
downloadopensim-SC-8c21b30a51ff002b91ef843fefbdb00e090a95df.zip
opensim-SC-8c21b30a51ff002b91ef843fefbdb00e090a95df.tar.gz
opensim-SC-8c21b30a51ff002b91ef843fefbdb00e090a95df.tar.bz2
opensim-SC-8c21b30a51ff002b91ef843fefbdb00e090a95df.tar.xz
do dispatch RequestLure ims
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs6
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs5
-rw-r--r--OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs2
3 files changed, 12 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs
index 10781e9..8aab90a 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
150 150
151 void OnInstantMessage(IClientAPI client, GridInstantMessage im) 151 void OnInstantMessage(IClientAPI client, GridInstantMessage im)
152 { 152 {
153 if (im.dialog == (byte)InstantMessageDialog.RequestLure)
154 {
155 if (m_TransferModule != null)
156 m_TransferModule.SendInstantMessage(im, delegate (bool success) { });
157 }
153 } 158 }
154 159
155 void OnIncomingInstantMessage(GridInstantMessage im) 160 void OnIncomingInstantMessage(GridInstantMessage im)
@@ -170,6 +175,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
170 if (m_TransferModule != null) 175 if (m_TransferModule != null)
171 m_TransferModule.SendInstantMessage(im, delegate(bool success) { }); 176 m_TransferModule.SendInstantMessage(im, delegate(bool success) { });
172 } 177 }
178
173 } 179 }
174 180
175 public void OnStartLure(byte lureType, string message, UUID targetid, IClientAPI client) 181 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 6f79676..160a53e 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
143 143
144 public void OnInstantMessage(IClientAPI client, GridInstantMessage im) 144 public void OnInstantMessage(IClientAPI client, GridInstantMessage im)
145 { 145 {
146 if (im.dialog == (byte)InstantMessageDialog.RequestLure)
147 {
148 if (m_TransferModule != null)
149 m_TransferModule.SendInstantMessage(im, delegate (bool success) { });
150 }
146 } 151 }
147 152
148 public void OnStartLure(byte lureType, string message, UUID targetid, IClientAPI client) 153 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 a450dd6..b73e346 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
82 m_rndnums = new Random(seed); 82 m_rndnums = new Random(seed);
83 83
84 GenerateCloudCover(); 84 GenerateCloudCover();
85 m_dataVersion = (int)m_scene.AllocateLocalId(); 85 m_dataVersion = m_scene.AllocateIntId();
86 86
87 scene.EventManager.OnNewClient += CloudsToClient; 87 scene.EventManager.OnNewClient += CloudsToClient;
88 scene.EventManager.OnFrame += CloudUpdate; 88 scene.EventManager.OnFrame += CloudUpdate;