From 1bb1d5d9b06887380eec0696102eb859f04810e6 Mon Sep 17 00:00:00 2001 From: Dr Scofield Date: Mon, 26 May 2008 15:37:31 +0000 Subject: This cleans up a merge mess from the earlier checkin and implements llOwnerSay() via the newly created Scene.SimBroadcast() call. --- .../Compiler/Server_API/LSL_BuiltIn_Commands.cs | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs') diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs index 64d3493..b06a457 100644 --- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs @@ -272,19 +272,30 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler public void llWhisper(int channelID, string text) { World.SimChat(Helpers.StringToField(text), - ChatTypeEnum.Whisper, channelID, m_host.AbsolutePosition, m_host.Name, m_host.UUID); + ChatTypeEnum.Whisper, channelID, m_host.AbsolutePosition, + m_host.Name, m_host.UUID, false); } public void llSay(int channelID, string text) { World.SimChat(Helpers.StringToField(text), - ChatTypeEnum.Say, channelID, m_host.AbsolutePosition, m_host.Name, m_host.UUID); + ChatTypeEnum.Say, channelID, m_host.AbsolutePosition, + m_host.Name, m_host.UUID, false); } public void llShout(int channelID, string text) { World.SimChat(Helpers.StringToField(text), - ChatTypeEnum.Shout, channelID, m_host.AbsolutePosition, m_host.Name, m_host.UUID); + ChatTypeEnum.Shout, channelID, m_host.AbsolutePosition, + m_host.Name, m_host.UUID, false); + } + + public void llOwnerSay(string msg) + { + m_log.DebugFormat("llOwnerSay(\"{0}\")", msg); + World.SimChatBroadcast(Helpers.StringToField(text), + ChatTypeEnum.Owner, 0, m_host.AbsolutePosition, + m_host.Name, m_host.UUID, false); } public int llListen(int channelID, string name, string ID, string msg) @@ -2032,11 +2043,6 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler return ""; } - public void llOwnerSay(string msg) - { - NotImplemented("llOwnerSay"); - } - public void llRequestSimulatorData(string simulator, int data) { NotImplemented("llRequestSimulatorData"); -- cgit v1.1