diff options
author | Dr Scofield | 2008-05-26 15:37:31 +0000 |
---|---|---|
committer | Dr Scofield | 2008-05-26 15:37:31 +0000 |
commit | 1bb1d5d9b06887380eec0696102eb859f04810e6 (patch) | |
tree | fecd69763a3daeba464a1bcbc1349828dd9445b3 /OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | |
parent | Adding OnChatBroadcast event logic to EventManager providing (diff) | |
download | opensim-SC-1bb1d5d9b06887380eec0696102eb859f04810e6.zip opensim-SC-1bb1d5d9b06887380eec0696102eb859f04810e6.tar.gz opensim-SC-1bb1d5d9b06887380eec0696102eb859f04810e6.tar.bz2 opensim-SC-1bb1d5d9b06887380eec0696102eb859f04810e6.tar.xz |
This cleans up a merge mess from the earlier checkin and implements llOwnerSay()
via the newly created Scene.SimBroadcast() call.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index 9446844..efdf249 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | |||
@@ -50,7 +50,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
50 | /// </summary> | 50 | /// </summary> |
51 | public class LSL_BuiltIn_Commands : MarshalByRefObject, LSL_BuiltIn_Commands_Interface | 51 | public class LSL_BuiltIn_Commands : MarshalByRefObject, LSL_BuiltIn_Commands_Interface |
52 | { | 52 | { |
53 | // private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 53 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
54 | 54 | ||
55 | internal ScriptEngineBase.ScriptEngine m_ScriptEngine; | 55 | internal ScriptEngineBase.ScriptEngine m_ScriptEngine; |
56 | internal SceneObjectPart m_host; | 56 | internal SceneObjectPart m_host; |
@@ -409,7 +409,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
409 | { | 409 | { |
410 | m_host.AddScriptLPS(1); | 410 | m_host.AddScriptLPS(1); |
411 | World.SimChat(Helpers.StringToField(text), | 411 | World.SimChat(Helpers.StringToField(text), |
412 | ChatTypeEnum.Whisper, channelID, m_host.AbsolutePosition, m_host.Name, m_host.UUID); | 412 | ChatTypeEnum.Whisper, channelID, m_host.AbsolutePosition, m_host.Name, m_host.UUID, false); |
413 | 413 | ||
414 | IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>(); | 414 | IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>(); |
415 | wComm.DeliverMessage(ChatTypeEnum.Whisper, channelID, m_host.Name, m_host.UUID, text); | 415 | wComm.DeliverMessage(ChatTypeEnum.Whisper, channelID, m_host.Name, m_host.UUID, text); |
@@ -419,7 +419,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
419 | { | 419 | { |
420 | m_host.AddScriptLPS(1); | 420 | m_host.AddScriptLPS(1); |
421 | World.SimChat(Helpers.StringToField(text), | 421 | World.SimChat(Helpers.StringToField(text), |
422 | ChatTypeEnum.Say, channelID, m_host.AbsolutePosition, m_host.Name, m_host.UUID); | 422 | ChatTypeEnum.Say, channelID, m_host.AbsolutePosition, m_host.Name, m_host.UUID, false); |
423 | 423 | ||
424 | IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>(); | 424 | IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>(); |
425 | wComm.DeliverMessage(ChatTypeEnum.Say, channelID, m_host.Name, m_host.UUID, text); | 425 | wComm.DeliverMessage(ChatTypeEnum.Say, channelID, m_host.Name, m_host.UUID, text); |
@@ -429,7 +429,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
429 | { | 429 | { |
430 | m_host.AddScriptLPS(1); | 430 | m_host.AddScriptLPS(1); |
431 | World.SimChat(Helpers.StringToField(text), | 431 | World.SimChat(Helpers.StringToField(text), |
432 | ChatTypeEnum.Shout, channelID, m_host.AbsolutePosition, m_host.Name, m_host.UUID); | 432 | ChatTypeEnum.Shout, channelID, m_host.AbsolutePosition, m_host.Name, m_host.UUID, false); |
433 | 433 | ||
434 | IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>(); | 434 | IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>(); |
435 | wComm.DeliverMessage(ChatTypeEnum.Shout, channelID, m_host.Name, m_host.UUID, text); | 435 | wComm.DeliverMessage(ChatTypeEnum.Shout, channelID, m_host.Name, m_host.UUID, text); |
@@ -5478,15 +5478,13 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
5478 | 5478 | ||
5479 | public void llOwnerSay(string msg) | 5479 | public void llOwnerSay(string msg) |
5480 | { | 5480 | { |
5481 | //m_host.AddScriptLPS(1); // since we reuse llInstantMessage | 5481 | m_host.AddScriptLPS(1); |
5482 | //temp fix so that lsl wiki examples aren't annoying to use to test other functions | 5482 | World.SimChatBroadcast(Helpers.StringToField(msg), |
5483 | //should be similar to : llInstantMessage(llGetOwner(),msg) | 5483 | ChatTypeEnum.Owner, 0, m_host.AbsolutePosition, |
5484 | // llGetOwner ==> m_host.ObjectOwner.ToString() | 5484 | m_host.Name, m_host.UUID, false); |
5485 | llInstantMessage(m_host.ObjectOwner.ToString(),msg); | ||
5486 | 5485 | ||
5487 | //World.SimChat(Helpers.StringToField(msg), ChatTypeEnum.Owner, 0, m_host.AbsolutePosition, m_host.Name, m_host.UUID); | 5486 | IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>(); |
5488 | //IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>(); | 5487 | wComm.DeliverMessage(ChatTypeEnum.Owner, 0, m_host.Name, m_host.UUID, msg); |
5489 | //wComm.DeliverMessage(ChatTypeEnum.Owner, 0, m_host.Name, m_host.UUID, msg); | ||
5490 | } | 5488 | } |
5491 | 5489 | ||
5492 | public void llRequestSimulatorData(string simulator, int data) | 5490 | public void llRequestSimulatorData(string simulator, int data) |