OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove unused return value on DeliverMessageTo()

LSLKeyTest
UbitUmarov 2015-11-20 00:09:56 +00:00
parent 278687b1e8
commit 0c93159297
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
View File

@ -369,10 +369,10 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
/// <param name='msg'> /// <param name='msg'>
/// Message. /// Message.
/// </param> /// </param>
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) if (channel == DEBUG_CHANNEL)
return true; return;
// Is id an avatar? // Is id an avatar?
ScenePresence sp = m_scene.GetScenePresence(target); ScenePresence sp = m_scene.GetScenePresence(target);
@ -384,17 +384,17 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
{ {
// Channel 0 goes to viewer ONLY // Channel 0 goes to viewer ONLY
m_scene.SimChat(Utils.StringToBytes(msg), ChatTypeEnum.Broadcast, 0, pos, name, id, target, false, false); 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 // for now messages to prims don't cross regions
if(sp.IsChildAgent) if(sp.IsChildAgent)
return false; return;
List<SceneObjectGroup> attachments = sp.GetAttachments(); List<SceneObjectGroup> attachments = sp.GetAttachments();
if (attachments.Count == 0) if (attachments.Count == 0)
return true; return;
// Get uuid of attachments // Get uuid of attachments
List<UUID> targets = new List<UUID>(); List<UUID> targets = new List<UUID>();
@ -417,12 +417,12 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
QueueMessage(new ListenerInfo(li, name, id, msg)); QueueMessage(new ListenerInfo(li, name, id, msg));
} }
return true; return;
} }
SceneObjectPart part = m_scene.GetSceneObjectPart(target); SceneObjectPart part = m_scene.GetSceneObjectPart(target);
if (part == null) // Not even an object 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)) foreach (ListenerInfo li in m_listenerManager.GetListeners(UUID.Zero, channel, name, id, msg))
{ {
@ -441,8 +441,6 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
break; break;
} }
} }
return true;
} }
protected void QueueMessage(ListenerInfo li) protected void QueueMessage(ListenerInfo li)

2
OpenSim/Region/Framework/Interfaces/IWorldComm.cs
View File

@ -127,7 +127,7 @@ namespace OpenSim.Region.Framework.Interfaces
/// <param name='msg'> /// <param name='msg'>
/// Message. /// Message.
/// </param> /// </param>
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);
/// <summary> /// <summary>
/// Are there any listen events ready to be dispatched? /// Are there any listen events ready to be dispatched?