aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Instance
diff options
context:
space:
mode:
authorMelanie Thielker2008-09-29 10:30:01 +0000
committerMelanie Thielker2008-09-29 10:30:01 +0000
commit538f51f36d6e41d556d9e65230ccdaaaa220e224 (patch)
tree87fafd76df568aea2dbd280bbd122cde257ad39a /OpenSim/Region/ScriptEngine/Shared/Instance
parentImplement the plumbing for llSetVehicleType from the LSL (diff)
downloadopensim-SC_OLD-538f51f36d6e41d556d9e65230ccdaaaa220e224.zip
opensim-SC_OLD-538f51f36d6e41d556d9e65230ccdaaaa220e224.tar.gz
opensim-SC_OLD-538f51f36d6e41d556d9e65230ccdaaaa220e224.tar.bz2
opensim-SC_OLD-538f51f36d6e41d556d9e65230ccdaaaa220e224.tar.xz
Mantis #2293
Fix a null reference exception when the exception thrown by a script is not a TargetInvocationException
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Instance')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index aa9ace4..dcf3043 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -825,6 +825,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
825 825
826 string FormatException(Exception e) 826 string FormatException(Exception e)
827 { 827 {
828 if (e.InnerException == null) // Not a normal runtime error
829 return e.ToString();
830
828 string message = "Runtime error:\n" + e.InnerException.StackTrace; 831 string message = "Runtime error:\n" + e.InnerException.StackTrace;
829 string[] lines = message.Split(new char[] {'\n'}); 832 string[] lines = message.Split(new char[] {'\n'});
830 833