diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs | 11 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Enums.cs | 3 |
2 files changed, 9 insertions, 5 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs index da30535..2233913 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs | |||
@@ -207,7 +207,8 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
207 | 207 | ||
208 | public void DoScriptLoadUnload() | 208 | public void DoScriptLoadUnload() |
209 | { | 209 | { |
210 | lock (LUQueue) { | 210 | lock (LUQueue) |
211 | { | ||
211 | if (LUQueue.Count > 0) | 212 | if (LUQueue.Count > 0) |
212 | { | 213 | { |
213 | LUStruct item = LUQueue.Dequeue(); | 214 | LUStruct item = LUQueue.Dequeue(); |
@@ -216,7 +217,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
216 | { | 217 | { |
217 | _StopScript(item.localID, item.itemID); | 218 | _StopScript(item.localID, item.itemID); |
218 | } | 219 | } |
219 | if (item.Action == LUType.Load) | 220 | else if (item.Action == LUType.Load) |
220 | { | 221 | { |
221 | _StartScript(item.localID, item.itemID, item.script); | 222 | _StartScript(item.localID, item.itemID, item.script); |
222 | } | 223 | } |
@@ -249,7 +250,8 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
249 | /// <param name="localID"></param> | 250 | /// <param name="localID"></param> |
250 | public void StartScript(uint localID, LLUUID itemID, string Script) | 251 | public void StartScript(uint localID, LLUUID itemID, string Script) |
251 | { | 252 | { |
252 | lock(LUQueue) { | 253 | lock (LUQueue) |
254 | { | ||
253 | if (LUQueue.Count >= LoadUnloadMaxQueueSize) | 255 | if (LUQueue.Count >= LoadUnloadMaxQueueSize) |
254 | { | 256 | { |
255 | m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: ERROR: Load/unload queue item count is at " + LUQueue.Count + ". Config variable \"LoadUnloadMaxQueueSize\" is set to " + LoadUnloadMaxQueueSize + ", so ignoring new script."); | 257 | m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: ERROR: Load/unload queue item count is at " + LUQueue.Count + ". Config variable \"LoadUnloadMaxQueueSize\" is set to " + LoadUnloadMaxQueueSize + ", so ignoring new script."); |
@@ -276,7 +278,8 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
276 | ls.localID = localID; | 278 | ls.localID = localID; |
277 | ls.itemID = itemID; | 279 | ls.itemID = itemID; |
278 | ls.Action = LUType.Unload; | 280 | ls.Action = LUType.Unload; |
279 | lock (LUQueue) { | 281 | lock (LUQueue) |
282 | { | ||
280 | LUQueue.Enqueue(ls); | 283 | LUQueue.Enqueue(ls); |
281 | } | 284 | } |
282 | } | 285 | } |
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Enums.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Enums.cs index 7b4a1af..c721267 100644 --- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Enums.cs +++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Enums.cs | |||
@@ -34,7 +34,8 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO | |||
34 | { | 34 | { |
35 | //public System.Collections.Generic.Dictionary<Byte, Type> OpCode_Add_Types; | 35 | //public System.Collections.Generic.Dictionary<Byte, Type> OpCode_Add_Types; |
36 | 36 | ||
37 | //LSO_Enums() { | 37 | //LSO_Enums() |
38 | //{ | ||
38 | // OpCode_Add_Types.Add(51, typeof(String)); | 39 | // OpCode_Add_Types.Add(51, typeof(String)); |
39 | // OpCode_Add_Types.Add(17, typeof(UInt32)); | 40 | // OpCode_Add_Types.Add(17, typeof(UInt32)); |
40 | //} | 41 | //} |