aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api
diff options
context:
space:
mode:
authorEdward2014-09-15 11:56:49 -0700
committerJustin Clark-Casey (justincc)2014-09-17 23:37:18 +0100
commit427240f935dabeeee272d8c84ed90af5a497b133 (patch)
treeccf26c83fa8fd12ad4dbd6bf2bfa56a03cc72730 /OpenSim/Region/ScriptEngine/Shared/Api
parentRevert "Small changes to threading to send thread names to unmanaged threads.... (diff)
downloadopensim-SC_OLD-427240f935dabeeee272d8c84ed90af5a497b133.zip
opensim-SC_OLD-427240f935dabeeee272d8c84ed90af5a497b133.tar.gz
opensim-SC_OLD-427240f935dabeeee272d8c84ed90af5a497b133.tar.bz2
opensim-SC_OLD-427240f935dabeeee272d8c84ed90af5a497b133.tar.xz
Changes to be committed: modified: OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs modified: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs This solves mantis bug# 5005: llRegionSay script does not trigger ChatFromWorld event. This was solved by adding World.SimChat() command to the llRegionSay() function (per suggestion of DrCuriosity). Additionally this fixes llRegionSayTo() which was also not functioning by adding a World.SimChat() command and adding a new SimChatToAgent() overrided function to Scene.PacketHandlers.cs This is the second patch revision. Corrections made to the position of World.SimChat() and removal of tabs per suggestion by justincc.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 7c384b2..e7ba7a4 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -968,6 +968,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
968 968
969 m_host.AddScriptLPS(1); 969 m_host.AddScriptLPS(1);
970 970
971 World.SimChat(Utils.StringToBytes(text),
972 ChatTypeEnum.Region, channelID, m_host.ParentGroup.RootPart.AbsolutePosition, m_host.Name, m_host.UUID, false);
973
971 IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>(); 974 IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
972 if (wComm != null) 975 if (wComm != null)
973 wComm.DeliverMessage(ChatTypeEnum.Region, channelID, m_host.Name, m_host.UUID, text); 976 wComm.DeliverMessage(ChatTypeEnum.Region, channelID, m_host.Name, m_host.UUID, text);
@@ -988,6 +991,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
988 UUID TargetID; 991 UUID TargetID;
989 UUID.TryParse(target, out TargetID); 992 UUID.TryParse(target, out TargetID);
990 993
994 World.SimChatToAgent(TargetID, Utils.StringToBytes(msg),
995 channel, m_host.ParentGroup.RootPart.AbsolutePosition, m_host.Name, m_host.UUID, true);
996
991 IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>(); 997 IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
992 if (wComm != null) 998 if (wComm != null)
993 wComm.DeliverMessageTo(TargetID, channel, m_host.AbsolutePosition, m_host.Name, m_host.UUID, msg); 999 wComm.DeliverMessageTo(TargetID, channel, m_host.AbsolutePosition, m_host.Name, m_host.UUID, msg);