aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation
diff options
context:
space:
mode:
authorBlueWall2011-08-20 12:36:35 -0400
committerBlueWall2011-08-20 12:36:35 -0400
commit5e231acdce7a006a4d88a205044d9862f7d4dda8 (patch)
tree7ce528d13ddabcdcd19b9fb3b55232661d5db34d /OpenSim/Region/ScriptEngine/Shared/Api/Implementation
parentAdd llRegionSayTo (diff)
downloadopensim-SC_OLD-5e231acdce7a006a4d88a205044d9862f7d4dda8.zip
opensim-SC_OLD-5e231acdce7a006a4d88a205044d9862f7d4dda8.tar.gz
opensim-SC_OLD-5e231acdce7a006a4d88a205044d9862f7d4dda8.tar.bz2
opensim-SC_OLD-5e231acdce7a006a4d88a205044d9862f7d4dda8.tar.xz
Add avatar and attachments to llRegionSay
llRegionSay will now message avatars on chan 0 and will message attachments on the avatar that listen on channels other than 0. This behavior is consistant with the LL implementation as tested on regions in Agni with one exception: this implementation does not include issue: https://jira.secondlife.com/browse/SCR-66?
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs9
1 files changed, 3 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 25d7ad9..db45354 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -845,11 +845,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
845 845
846 public void llRegionSayTo(string target, int channel, string msg) 846 public void llRegionSayTo(string target, int channel, string msg)
847 { 847 {
848 if (channel == 0) 848 string error = String.Empty;
849 {
850 LSLError("Cannot use llRegionSay() on channel 0");
851 return;
852 }
853 849
854 if (msg.Length > 1023) 850 if (msg.Length > 1023)
855 msg = msg.Substring(0, 1023); 851 msg = msg.Substring(0, 1023);
@@ -861,7 +857,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
861 857
862 IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>(); 858 IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
863 if (wComm != null) 859 if (wComm != null)
864 wComm.DeliverMessageTo(TargetID, channel, m_host.Name, m_host.UUID, msg); 860 if (!wComm.DeliverMessageTo(TargetID, channel, m_host.AbsolutePosition, m_host.Name, m_host.UUID, msg, out error))
861 LSLError(error);
865 } 862 }
866 863
867 public LSL_Integer llListen(int channelID, string name, string ID, string msg) 864 public LSL_Integer llListen(int channelID, string name, string ID, string msg)