aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs4
-rw-r--r--OpenSim/Region/Framework/Interfaces/IWorldComm.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs7
3 files changed, 8 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
index 93a4f09..1a53a8b 100644
--- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
@@ -368,10 +368,8 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
368 /// <param name='msg'> 368 /// <param name='msg'>
369 /// Message. 369 /// Message.
370 /// </param> 370 /// </param>
371 public bool DeliverMessageTo(UUID target, int channel, Vector3 pos, string name, UUID id, string msg, out string error) 371 public bool DeliverMessageTo(UUID target, int channel, Vector3 pos, string name, UUID id, string msg)
372 { 372 {
373 error = null;
374
375 if (channel == DEBUG_CHANNEL) 373 if (channel == DEBUG_CHANNEL)
376 return true; 374 return true;
377 375
diff --git a/OpenSim/Region/Framework/Interfaces/IWorldComm.cs b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
index 20e0199..c01c56d 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, out string error); 130 bool 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?
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index fe0d3a4..ffc6f03 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1281,6 +1281,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1281 1281
1282 m_host.AddScriptLPS(1); 1282 m_host.AddScriptLPS(1);
1283 1283
1284 if (channel == ScriptBaseClass.DEBUG_CHANNEL)
1285 {
1286 return;
1287 }
1288
1284 UUID TargetID; 1289 UUID TargetID;
1285 UUID.TryParse(target, out TargetID); 1290 UUID.TryParse(target, out TargetID);
1286 1291
@@ -1289,7 +1294,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1289 1294
1290 IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>(); 1295 IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
1291 if (wComm != null) 1296 if (wComm != null)
1292 wComm.DeliverMessageTo(TargetID, channel, m_host.AbsolutePosition, m_host.Name, m_host.UUID, msg, out error); 1297 wComm.DeliverMessageTo(TargetID, channel, m_host.AbsolutePosition, m_host.Name, m_host.UUID, msg);
1293 } 1298 }
1294 1299
1295 public LSL_Integer llListen(int channelID, string name, string ID, string msg) 1300 public LSL_Integer llListen(int channelID, string name, string ID, string msg)