diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs index 9282897397..68ca2ad475 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 /// /// Message. /// - public bool DeliverMessageTo(UUID target, int channel, Vector3 pos, string name, UUID id, string msg) + public void DeliverMessageTo(UUID target, int channel, Vector3 pos, string name, UUID id, string msg) { if (channel == DEBUG_CHANNEL) - return true; + return; // Is id an avatar? ScenePresence sp = m_scene.GetScenePresence(target); @@ -384,17 +384,17 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm { // Channel 0 goes to viewer ONLY m_scene.SimChat(Utils.StringToBytes(msg), ChatTypeEnum.Broadcast, 0, pos, name, id, target, false, false); - return true; + return; } // for now messages to prims don't cross regions if(sp.IsChildAgent) - return false; + return; List attachments = sp.GetAttachments(); if (attachments.Count == 0) - return true; + return; // Get uuid of attachments List targets = new List(); @@ -417,12 +417,12 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm QueueMessage(new ListenerInfo(li, name, id, msg)); } - return true; + return; } SceneObjectPart part = m_scene.GetSceneObjectPart(target); if (part == null) // Not even an object - return true; // No error + return; // No error foreach (ListenerInfo li in m_listenerManager.GetListeners(UUID.Zero, channel, name, id, msg)) { @@ -441,8 +441,6 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm break; } } - - return true; } protected void QueueMessage(ListenerInfo li) diff --git a/OpenSim/Region/Framework/Interfaces/IWorldComm.cs b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs index c01c56d8da..d76a0d755d 100644 --- a/OpenSim/Region/Framework/Interfaces/IWorldComm.cs +++ b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs @@ -127,7 +127,7 @@ namespace OpenSim.Region.Framework.Interfaces /// /// Message. /// - bool DeliverMessageTo(UUID target, int channel, Vector3 pos, string name, UUID id, string msg); + void DeliverMessageTo(UUID target, int channel, Vector3 pos, string name, UUID id, string msg); /// /// Are there any listen events ready to be dispatched?