diff options
author | UbitUmarov | 2018-06-09 20:35:35 +0100 |
---|---|---|
committer | UbitUmarov | 2018-06-09 20:35:35 +0100 |
commit | a48d65fd77f778d51dbfaca7a64e83d56e27fede (patch) | |
tree | 75400e405332841b836e408ee0035277635e2ff5 /OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs | |
parent | change MaxRegionsViewDistance description a bit (diff) | |
download | opensim-SC-a48d65fd77f778d51dbfaca7a64e83d56e27fede.zip opensim-SC-a48d65fd77f778d51dbfaca7a64e83d56e27fede.tar.gz opensim-SC-a48d65fd77f778d51dbfaca7a64e83d56e27fede.tar.bz2 opensim-SC-a48d65fd77f778d51dbfaca7a64e83d56e27fede.tar.xz |
Yengine apply a fix to CheckRunLockInvariants by mrieker
Diffstat (limited to 'OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs b/OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs index 25f7209..ce0823d 100644 --- a/OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs +++ b/OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs | |||
@@ -447,8 +447,9 @@ namespace OpenSim.Region.ScriptEngine.Yengine | |||
447 | // The script threw some kind of exception that was not caught at | 447 | // The script threw some kind of exception that was not caught at |
448 | // script level, so the script is no longer running an event handler. | 448 | // script level, so the script is no longer running an event handler. |
449 | eventCode = ScriptEventCode.None; | 449 | eventCode = ScriptEventCode.None; |
450 | stackFrames = null; | ||
450 | 451 | ||
451 | if(e is ScriptDeleteException) | 452 | if (e is ScriptDeleteException) |
452 | { | 453 | { |
453 | // Script did something like llRemoveInventory(llGetScriptName()); | 454 | // Script did something like llRemoveInventory(llGetScriptName()); |
454 | // ... to delete itself from the object. | 455 | // ... to delete itself from the object. |
@@ -474,7 +475,6 @@ namespace OpenSim.Region.ScriptEngine.Yengine | |||
474 | // Some general script error. | 475 | // Some general script error. |
475 | SendErrorMessage(e); | 476 | SendErrorMessage(e); |
476 | } | 477 | } |
477 | return; | ||
478 | } | 478 | } |
479 | 479 | ||
480 | /** | 480 | /** |