aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api
diff options
context:
space:
mode:
authorMelanie2012-04-23 20:44:41 +0100
committerMelanie2012-04-23 20:44:41 +0100
commite9037098475202c02d3327d2dff877d0fd108c93 (patch)
treecd52623e1f12ffe0ca98609f270d27d30afc35af /OpenSim/Region/ScriptEngine/Shared/Api
parentMerge branch 'master' into careminster (diff)
parentMantis 5977 Corrections to llRegionSayTo (diff)
downloadopensim-SC-e9037098475202c02d3327d2dff877d0fd108c93.zip
opensim-SC-e9037098475202c02d3327d2dff877d0fd108c93.tar.gz
opensim-SC-e9037098475202c02d3327d2dff877d0fd108c93.tar.bz2
opensim-SC-e9037098475202c02d3327d2dff877d0fd108c93.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index e9ec314..425d2c5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -948,13 +948,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
948 948
949 m_host.AddScriptLPS(1); 949 m_host.AddScriptLPS(1);
950 950
951 if (channel == ScriptBaseClass.DEBUG_CHANNEL)
952 {
953 return;
954 }
955
951 UUID TargetID; 956 UUID TargetID;
952 UUID.TryParse(target, out TargetID); 957 UUID.TryParse(target, out TargetID);
953 958
954 IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>(); 959 IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
955 if (wComm != null) 960 if (wComm != null)
956 if (!wComm.DeliverMessageTo(TargetID, channel, m_host.AbsolutePosition, m_host.Name, m_host.UUID, msg, out error)) 961 wComm.DeliverMessageTo(TargetID, channel, m_host.AbsolutePosition, m_host.Name, m_host.UUID, msg);
957 LSLError(error);
958 } 962 }
959 963
960 public LSL_Integer llListen(int channelID, string name, string ID, string msg) 964 public LSL_Integer llListen(int channelID, string name, string ID, string msg)