diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs | 16 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IWorldComm.cs | 2 |
2 files changed, 8 insertions, 10 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs index 9282897..68ca2ad 100644 --- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs | |||
@@ -369,10 +369,10 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm | |||
369 | /// <param name='msg'> | 369 | /// <param name='msg'> |
370 | /// Message. | 370 | /// Message. |
371 | /// </param> | 371 | /// </param> |
372 | public bool DeliverMessageTo(UUID target, int channel, Vector3 pos, string name, UUID id, string msg) | 372 | public void DeliverMessageTo(UUID target, int channel, Vector3 pos, string name, UUID id, string msg) |
373 | { | 373 | { |
374 | if (channel == DEBUG_CHANNEL) | 374 | if (channel == DEBUG_CHANNEL) |
375 | return true; | 375 | return; |
376 | 376 | ||
377 | // Is id an avatar? | 377 | // Is id an avatar? |
378 | ScenePresence sp = m_scene.GetScenePresence(target); | 378 | ScenePresence sp = m_scene.GetScenePresence(target); |
@@ -384,17 +384,17 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm | |||
384 | { | 384 | { |
385 | // Channel 0 goes to viewer ONLY | 385 | // Channel 0 goes to viewer ONLY |
386 | m_scene.SimChat(Utils.StringToBytes(msg), ChatTypeEnum.Broadcast, 0, pos, name, id, target, false, false); | 386 | m_scene.SimChat(Utils.StringToBytes(msg), ChatTypeEnum.Broadcast, 0, pos, name, id, target, false, false); |
387 | return true; | 387 | return; |
388 | } | 388 | } |
389 | 389 | ||
390 | // for now messages to prims don't cross regions | 390 | // for now messages to prims don't cross regions |
391 | if(sp.IsChildAgent) | 391 | if(sp.IsChildAgent) |
392 | return false; | 392 | return; |
393 | 393 | ||
394 | List<SceneObjectGroup> attachments = sp.GetAttachments(); | 394 | List<SceneObjectGroup> attachments = sp.GetAttachments(); |
395 | 395 | ||
396 | if (attachments.Count == 0) | 396 | if (attachments.Count == 0) |
397 | return true; | 397 | return; |
398 | 398 | ||
399 | // Get uuid of attachments | 399 | // Get uuid of attachments |
400 | List<UUID> targets = new List<UUID>(); | 400 | List<UUID> targets = new List<UUID>(); |
@@ -417,12 +417,12 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm | |||
417 | QueueMessage(new ListenerInfo(li, name, id, msg)); | 417 | QueueMessage(new ListenerInfo(li, name, id, msg)); |
418 | } | 418 | } |
419 | 419 | ||
420 | return true; | 420 | return; |
421 | } | 421 | } |
422 | 422 | ||
423 | SceneObjectPart part = m_scene.GetSceneObjectPart(target); | 423 | SceneObjectPart part = m_scene.GetSceneObjectPart(target); |
424 | if (part == null) // Not even an object | 424 | if (part == null) // Not even an object |
425 | return true; // No error | 425 | return; // No error |
426 | 426 | ||
427 | foreach (ListenerInfo li in m_listenerManager.GetListeners(UUID.Zero, channel, name, id, msg)) | 427 | foreach (ListenerInfo li in m_listenerManager.GetListeners(UUID.Zero, channel, name, id, msg)) |
428 | { | 428 | { |
@@ -441,8 +441,6 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm | |||
441 | break; | 441 | break; |
442 | } | 442 | } |
443 | } | 443 | } |
444 | |||
445 | return true; | ||
446 | } | 444 | } |
447 | 445 | ||
448 | protected void QueueMessage(ListenerInfo li) | 446 | protected void QueueMessage(ListenerInfo li) |
diff --git a/OpenSim/Region/Framework/Interfaces/IWorldComm.cs b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs index c01c56d..d76a0d7 100644 --- a/OpenSim/Region/Framework/Interfaces/IWorldComm.cs +++ b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs | |||
@@ -127,7 +127,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
127 | /// <param name='msg'> | 127 | /// <param name='msg'> |
128 | /// Message. | 128 | /// Message. |
129 | /// </param> | 129 | /// </param> |
130 | bool DeliverMessageTo(UUID target, int channel, Vector3 pos, string name, UUID id, string msg); | 130 | void DeliverMessageTo(UUID target, int channel, Vector3 pos, string name, UUID id, string msg); |
131 | 131 | ||
132 | /// <summary> | 132 | /// <summary> |
133 | /// Are there any listen events ready to be dispatched? | 133 | /// Are there any listen events ready to be dispatched? |