Lowered priority of script threads. Executing state_entry() event on script rez.

4 files changed, 2 insertions, 11 deletions

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
index 14ee1ec..b58e996 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
@@ -17,7 +17,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
         //private ICodeCompiler icc = codeProvider.CreateCompiler();

         public string CompileFromFile(string LSOFileName)

         {

-            string CS_Code;

             switch (System.IO.Path.GetExtension(LSOFileName).ToLower())

             {

                 case ".txt":

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 de1385c..ca51542 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
@@ -133,19 +133,12 @@ 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 + "\"");

             //type for whisper is 0

             World.SimChat(Helpers.StringToField(text),

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

-

-

         }

-        //public void llSay(int channelID, string text)

         public void llSay(int channelID, string text)

         {

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

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

             //type for say is 1

 

             World.SimChat(Helpers.StringToField(text),

@@ -154,11 +147,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
 

         public void llShout(int channelID, string 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);

-

         }

 

         public int llListen(int channelID, string name, string ID, string msg) { return 0; }

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
index a20a95a..ea5500a 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
             //);

             Console.WriteLine("OnRezScript localID: " + localID + " LLUID: " + itemID.ToString() + " Size: " + script.Length);

             myScriptEngine.myScriptManager.StartScript(localID, itemID, script);

-

+            myScriptEngine.myEventQueueManager.AddToObjectQueue(localID, "state_entry", new object[] { });

         }

         public void OnRemoveScript(uint localID, LLUUID itemID)

         {

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
index a436bff..012e60d 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
@@ -90,6 +90,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
                 Thread EventQueueThread = new Thread(EventQueueThreadLoop);

                 EventQueueThreads.Add(EventQueueThread);

                 EventQueueThread.IsBackground = true;

+                EventQueueThread.Priority = ThreadPriority.BelowNormal;

                 EventQueueThread.Name = "EventQueueManagerThread_" + ThreadCount;

                 EventQueueThread.Start();

             }