Moved in-AppDomain event execution from Script to OpenSim.Region.ScriptEngine.Executor. Script no longer responsible for handling event calls to itself (and we can create reference cache in Executor).

1 files changed, 4 insertions, 3 deletions

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
index 297a45c..8982bb6 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
@@ -16,6 +16,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
     /// </summary>

     public class LSL_BuiltIn_Commands: MarshalByRefObject, LSL_BuiltIn_Commands_Interface

     {

+

         private System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding();

         private ScriptManager m_manager;

         private IScriptHost m_host;

@@ -74,7 +75,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
         public void llWhisper(int channelID, string text)

         {

             //Common.SendToDebug("INTERNAL FUNCTION llWhisper(" + channelID + ", \"" + text + "\");");

-            Console.WriteLine("llWhisper Channel " + channelID + ", Text: \"" + text + "\"");

+            //Console.WriteLine("llWhisper Channel " + channelID + ", Text: \"" + text + "\"");

             //type for whisper is 0

             World.SimChat(Helpers.StringToField(text),

                           0, m_host.AbsolutePosition, m_host.Name, m_host.UUID);

@@ -86,7 +87,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
         {

             //TODO: DO SOMETHING USEFUL HERE

             //Common.SendToDebug("INTERNAL FUNCTION llSay(" + (int)channelID + ", \"" + (string)text + "\");");

-            Console.WriteLine("llSay Channel " + channelID + ", Text: \"" + text + "\"");

+            //Console.WriteLine("llSay Channel " + channelID + ", Text: \"" + text + "\"");

             //type for say is 1

 

             World.SimChat(Helpers.StringToField(text),

@@ -95,7 +96,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
 

         public void llShout(int channelID, string text)

         {

-            Console.WriteLine("llShout Channel " + channelID + ", Text: \"" + text + "\"");

+            //Console.WriteLine("llShout Channel " + channelID + ", Text: \"" + text + "\"");

             //type for shout is 2

             World.SimChat(Helpers.StringToField(text),

                           2, m_host.AbsolutePosition, m_host.Name, m_host.UUID);