aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authorMelanie2012-06-28 22:02:20 +0100
committerMelanie2012-06-28 22:02:20 +0100
commita1a22a2f1034a1feb67b141abf4b138248cdb356 (patch)
treeb1f71abd8e3f9a3106a4140ad35abba94c8468e5 /OpenSim/Region/ScriptEngine/Shared
parentMerge branch 'master' into careminster (diff)
downloadopensim-SC-a1a22a2f1034a1feb67b141abf4b138248cdb356.zip
opensim-SC-a1a22a2f1034a1feb67b141abf4b138248cdb356.tar.gz
opensim-SC-a1a22a2f1034a1feb67b141abf4b138248cdb356.tar.bz2
opensim-SC-a1a22a2f1034a1feb67b141abf4b138248cdb356.tar.xz
Revert "Mantis 5977 Corrections to llRegionSayTo"
This reverts commit 679da63da617d031e5e7ae3f2d2a29db1a23ace3. Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs10
1 files changed, 4 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 41de257..ffa19d9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -921,22 +921,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
921 921
922 public void llRegionSayTo(string target, int channel, string msg) 922 public void llRegionSayTo(string target, int channel, string msg)
923 { 923 {
924 string error = String.Empty;
925
924 if (msg.Length > 1023) 926 if (msg.Length > 1023)
925 msg = msg.Substring(0, 1023); 927 msg = msg.Substring(0, 1023);
926 928
927 m_host.AddScriptLPS(1); 929 m_host.AddScriptLPS(1);
928 930
929 if (channel == ScriptBaseClass.DEBUG_CHANNEL)
930 {
931 return;
932 }
933
934 UUID TargetID; 931 UUID TargetID;
935 UUID.TryParse(target, out TargetID); 932 UUID.TryParse(target, out TargetID);
936 933
937 IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>(); 934 IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
938 if (wComm != null) 935 if (wComm != null)
939 wComm.DeliverMessageTo(TargetID, channel, m_host.AbsolutePosition, m_host.Name, m_host.UUID, msg); 936 if (!wComm.DeliverMessageTo(TargetID, channel, m_host.AbsolutePosition, m_host.Name, m_host.UUID, msg, out error))
937 LSLError(error);
940 } 938 }
941 939
942 public LSL_Integer llListen(int channelID, string name, string ID, string msg) 940 public LSL_Integer llListen(int channelID, string name, string ID, string msg)