diff options
Diffstat (limited to '')
3 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs index 569009e..0feb967 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs | |||
@@ -225,7 +225,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
225 | // TODO: Let users in the sim and those entering it and possibly an external watchdog know what has happened | 225 | // TODO: Let users in the sim and those entering it and possibly an external watchdog know what has happened |
226 | m_log.ErrorFormat( | 226 | m_log.ErrorFormat( |
227 | "[{0}]: Event queue thread terminating with exception. PLEASE REBOOT YOUR SIM - SCRIPT EVENTS WILL NOT WORK UNTIL YOU DO. Exception is {1}", | 227 | "[{0}]: Event queue thread terminating with exception. PLEASE REBOOT YOUR SIM - SCRIPT EVENTS WILL NOT WORK UNTIL YOU DO. Exception is {1}", |
228 | ScriptEngineName, e); | 228 | ScriptEngineName, e); |
229 | } | 229 | } |
230 | } | 230 | } |
231 | 231 | ||
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs index 8ad916c..3c91b29 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs | |||
@@ -418,7 +418,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
418 | { | 418 | { |
419 | InstanceData id = m_ScriptManager.GetScript(localID, itemID); | 419 | InstanceData id = m_ScriptManager.GetScript(localID, itemID); |
420 | if (id == null) | 420 | if (id == null) |
421 | return; | 421 | return; |
422 | 422 | ||
423 | if (!id.Disabled) | 423 | if (!id.Disabled) |
424 | id.Running = true; | 424 | id.Running = true; |
@@ -428,7 +428,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
428 | { | 428 | { |
429 | InstanceData id = m_ScriptManager.GetScript(localID, itemID); | 429 | InstanceData id = m_ScriptManager.GetScript(localID, itemID); |
430 | if (id == null) | 430 | if (id == null) |
431 | return; | 431 | return; |
432 | 432 | ||
433 | id.Running = false; | 433 | id.Running = false; |
434 | } | 434 | } |
@@ -442,7 +442,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
442 | 442 | ||
443 | InstanceData id = m_ScriptManager.GetScript(localID, itemID); | 443 | InstanceData id = m_ScriptManager.GetScript(localID, itemID); |
444 | if (id == null) | 444 | if (id == null) |
445 | return; | 445 | return; |
446 | 446 | ||
447 | IEventQueue eq = World.RequestModuleInterface<IEventQueue>(); | 447 | IEventQueue eq = World.RequestModuleInterface<IEventQueue>(); |
448 | if (eq == null) | 448 | if (eq == null) |
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs index 9c1cd4d..6ac209e 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs | |||
@@ -520,13 +520,13 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
520 | ExeStage = 5; // ;^) Ewe Loon, for debuging | 520 | ExeStage = 5; // ;^) Ewe Loon, for debuging |
521 | } | 521 | } |
522 | catch (Exception e) // ;^) Ewe Loon, From here down tis fix | 522 | catch (Exception e) // ;^) Ewe Loon, From here down tis fix |
523 | { | 523 | { |
524 | if ((ExeStage == 3)&&(qParams.Length>0)) | 524 | if ((ExeStage == 3)&&(qParams.Length>0)) |
525 | detparms.Remove(id); | 525 | detparms.Remove(id); |
526 | SceneObjectPart ob = m_scriptEngine.World.GetSceneObjectPart(localID); | 526 | SceneObjectPart ob = m_scriptEngine.World.GetSceneObjectPart(localID); |
527 | m_log.InfoFormat("[Script Error] ,{0},{1},@{2},{3},{4},{5}", ob.Name , FunctionName, ExeStage, e.Message, qParams.Length, detparms.Count); | 527 | m_log.InfoFormat("[Script Error] ,{0},{1},@{2},{3},{4},{5}", ob.Name , FunctionName, ExeStage, e.Message, qParams.Length, detparms.Count); |
528 | if (ExeStage != 2) throw e; | 528 | if (ExeStage != 2) throw e; |
529 | } | 529 | } |
530 | } | 530 | } |
531 | 531 | ||
532 | public uint GetLocalID(UUID itemID) | 532 | public uint GetLocalID(UUID itemID) |