aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs51
1 files changed, 26 insertions, 25 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index 0c06630..4ede7f1 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -240,14 +240,14 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
240 } 240 }
241 catch (Exception e2) // LEGIT: User Scripting 241 catch (Exception e2) // LEGIT: User Scripting
242 { 242 {
243 m_scriptEngine.Log.Error("[" + 243 m_log.Error("[" +
244 m_scriptEngine.ScriptEngineName + 244 m_scriptEngine.ScriptEngineName +
245 "]: Error displaying error in-world: " + 245 "]: Error displaying error in-world: " +
246 e2.ToString()); 246 e2.ToString());
247 m_scriptEngine.Log.Error("[" + 247 m_log.Error("[" +
248 m_scriptEngine.ScriptEngineName + "]: " + 248 m_scriptEngine.ScriptEngineName + "]: " +
249 "Errormessage: Error compiling script:\r\n" + 249 "Errormessage: Error compiling script:\r\n" +
250 e2.Message.ToString()); 250 e2.Message.ToString());
251 } 251 }
252 } 252 }
253 } 253 }
@@ -258,8 +258,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
258 if (id == null) 258 if (id == null)
259 return; 259 return;
260 260
261 m_scriptEngine.Log.DebugFormat("[{0}]: Unloading script", 261 m_log.DebugFormat("[{0}]: Unloading script",
262 m_scriptEngine.ScriptEngineName); 262 m_scriptEngine.ScriptEngineName);
263 263
264 // Stop long command on script 264 // Stop long command on script
265 AsyncCommandManager.RemoveScript(m_scriptEngine, localID, itemID); 265 AsyncCommandManager.RemoveScript(m_scriptEngine, localID, itemID);
@@ -280,11 +280,11 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
280 } 280 }
281 catch (Exception e) // LEGIT: User Scripting 281 catch (Exception e) // LEGIT: User Scripting
282 { 282 {
283 m_scriptEngine.Log.Error("[" + 283 m_log.Error("[" +
284 m_scriptEngine.ScriptEngineName + 284 m_scriptEngine.ScriptEngineName +
285 "]: Exception stopping script localID: " + 285 "]: Exception stopping script localID: " +
286 localID + " LLUID: " + itemID.ToString() + 286 localID + " LLUID: " + itemID.ToString() +
287 ": " + e.ToString()); 287 ": " + e.ToString());
288 } 288 }
289 } 289 }
290 290
@@ -379,10 +379,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
379 } 379 }
380 else if (item.Action == LUType.Load) 380 else if (item.Action == LUType.Load)
381 { 381 {
382 m_scriptEngine.Log.DebugFormat("[{0}]: Loading script", 382 m_log.DebugFormat("[{0}]: Loading script",
383 m_scriptEngine.ScriptEngineName); 383 m_scriptEngine.ScriptEngineName);
384 _StartScript(item.localID, item.itemID, item.script, 384 _StartScript(item.localID, item.itemID, item.script,
385 item.startParam, item.postOnRez); 385 item.startParam, item.postOnRez);
386 } 386 }
387 } 387 }
388 } 388 }
@@ -414,13 +414,14 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
414 { 414 {
415 if ((LUQueue.Count >= LoadUnloadMaxQueueSize) && m_started) 415 if ((LUQueue.Count >= LoadUnloadMaxQueueSize) && m_started)
416 { 416 {
417 m_scriptEngine.Log.Error("[" + 417 m_log.Error("[" +
418 m_scriptEngine.ScriptEngineName + 418 m_scriptEngine.ScriptEngineName +
419 "]: ERROR: Load/unload queue item count is at " + 419 "]: ERROR: Load/unload queue item count is at " +
420 LUQueue.Count + 420 LUQueue.Count +
421 ". Config variable \"LoadUnloadMaxQueueSize\" "+ 421 ". Config variable \"LoadUnloadMaxQueueSize\" "+
422 "is set to " + LoadUnloadMaxQueueSize + 422 "is set to " + LoadUnloadMaxQueueSize +
423 ", so ignoring new script."); 423 ", so ignoring new script.");
424
424 return; 425 return;
425 } 426 }
426 427