Yengine apply a fix to CheckRunLockInvariants by mrieker

2 files changed, 5 insertions, 5 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
              // The script threw some kind of exception that was not caught at
              // script level, so the script is no longer running an event handler.
             eventCode = ScriptEventCode.None;
+            stackFrames = null;
 
-            if(e is ScriptDeleteException)
+            if (e is ScriptDeleteException)
             {
                  // Script did something like llRemoveInventory(llGetScriptName());
                  // ... to delete itself from the object.
@@ -474,7 +475,6 @@ namespace OpenSim.Region.ScriptEngine.Yengine
                  // Some general script error.
                 SendErrorMessage(e);
             }
-            return;
         }
 
         /**
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 7dcacd2..13c2c5e 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -171,11 +171,11 @@
 
         ; the maximum distance to tell a viewer to connect to a neighbour region, so it can be seen
         ; (it is limited by MaxDrawDistance above)
-        ; less than 256 shows imediate neighbours; 256 to 511 also second imediate neighbours etc
+        ; less than 256 shows immediate neighbours; 256 to 511 also second imediate neighbours etc
         ; more than 511m can cause viewers problems specially in case of dense regions.
         ; curretly this distance is from current region borders.
-        ; Warning: if relevant regions have diferent setting you may notice strange
-    ; effects due to that assimetry
+        ; Warning: if relevant regions have different setting you may notice strange
+    ; effects due to that asymmetry
     ; *****
         ;MaxRegionsViewDistance = 255