diff options
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 | |||
17 | //private ICodeCompiler icc = codeProvider.CreateCompiler(); | 17 | //private ICodeCompiler icc = codeProvider.CreateCompiler(); |
18 | public string CompileFromFile(string LSOFileName) | 18 | public string CompileFromFile(string LSOFileName) |
19 | { | 19 | { |
20 | string CS_Code; | ||
21 | switch (System.IO.Path.GetExtension(LSOFileName).ToLower()) | 20 | switch (System.IO.Path.GetExtension(LSOFileName).ToLower()) |
22 | { | 21 | { |
23 | case ".txt": | 22 | 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 | |||
133 | 133 | ||
134 | public void llWhisper(int channelID, string text) | 134 | public void llWhisper(int channelID, string text) |
135 | { | 135 | { |
136 | //Common.SendToDebug("INTERNAL FUNCTION llWhisper(" + channelID + ", \"" + text + "\");"); | ||
137 | //Console.WriteLine("llWhisper Channel " + channelID + ", Text: \"" + text + "\""); | ||
138 | //type for whisper is 0 | 136 | //type for whisper is 0 |
139 | World.SimChat(Helpers.StringToField(text), | 137 | World.SimChat(Helpers.StringToField(text), |
140 | 0, m_host.AbsolutePosition, m_host.Name, m_host.UUID); | 138 | 0, m_host.AbsolutePosition, m_host.Name, m_host.UUID); |
141 | |||
142 | |||
143 | } | 139 | } |
144 | //public void llSay(int channelID, string text) | ||
145 | public void llSay(int channelID, string text) | 140 | public void llSay(int channelID, string text) |
146 | { | 141 | { |
147 | //Common.SendToDebug("INTERNAL FUNCTION llSay(" + (int)channelID + ", \"" + (string)text + "\");"); | ||
148 | //Console.WriteLine("llSay Channel " + channelID + ", Text: \"" + text + "\""); | ||
149 | //type for say is 1 | 142 | //type for say is 1 |
150 | 143 | ||
151 | World.SimChat(Helpers.StringToField(text), | 144 | World.SimChat(Helpers.StringToField(text), |
@@ -154,11 +147,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler | |||
154 | 147 | ||
155 | public void llShout(int channelID, string text) | 148 | public void llShout(int channelID, string text) |
156 | { | 149 | { |
157 | //Console.WriteLine("llShout Channel " + channelID + ", Text: \"" + text + "\""); | ||
158 | //type for shout is 2 | 150 | //type for shout is 2 |
159 | World.SimChat(Helpers.StringToField(text), | 151 | World.SimChat(Helpers.StringToField(text), |
160 | 2, m_host.AbsolutePosition, m_host.Name, m_host.UUID); | 152 | 2, m_host.AbsolutePosition, m_host.Name, m_host.UUID); |
161 | |||
162 | } | 153 | } |
163 | 154 | ||
164 | public int llListen(int channelID, string name, string ID, string msg) { return 0; } | 155 | 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 | |||
77 | //); | 77 | //); |
78 | Console.WriteLine("OnRezScript localID: " + localID + " LLUID: " + itemID.ToString() + " Size: " + script.Length); | 78 | Console.WriteLine("OnRezScript localID: " + localID + " LLUID: " + itemID.ToString() + " Size: " + script.Length); |
79 | myScriptEngine.myScriptManager.StartScript(localID, itemID, script); | 79 | myScriptEngine.myScriptManager.StartScript(localID, itemID, script); |
80 | 80 | myScriptEngine.myEventQueueManager.AddToObjectQueue(localID, "state_entry", new object[] { }); | |
81 | } | 81 | } |
82 | public void OnRemoveScript(uint localID, LLUUID itemID) | 82 | public void OnRemoveScript(uint localID, LLUUID itemID) |
83 | { | 83 | { |
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 | |||
90 | Thread EventQueueThread = new Thread(EventQueueThreadLoop); | 90 | Thread EventQueueThread = new Thread(EventQueueThreadLoop); |
91 | EventQueueThreads.Add(EventQueueThread); | 91 | EventQueueThreads.Add(EventQueueThread); |
92 | EventQueueThread.IsBackground = true; | 92 | EventQueueThread.IsBackground = true; |
93 | EventQueueThread.Priority = ThreadPriority.BelowNormal; | ||
93 | EventQueueThread.Name = "EventQueueManagerThread_" + ThreadCount; | 94 | EventQueueThread.Name = "EventQueueManagerThread_" + ThreadCount; |
94 | EventQueueThread.Start(); | 95 | EventQueueThread.Start(); |
95 | } | 96 | } |