diff options
| author | Justin Clark-Casey (justincc) | 2014-03-25 00:20:38 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-03-25 00:20:38 +0000 |
| commit | 091f3a80008a0f4a756fcb9ff4e87a24c2948c3c (patch) | |
| tree | a98354e9317e0ed6892dec344a69447c0e9c70b8 /OpenSim/Region/ScriptEngine | |
| parent | Don't fail to enable permissions modules correctly if there is any leading or... (diff) | |
| parent | Fixed Debug command for Groups. (Use of wrong capitalization caused *two* "de... (diff) | |
| download | opensim-SC_OLD-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.zip opensim-SC_OLD-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.tar.gz opensim-SC_OLD-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.tar.bz2 opensim-SC_OLD-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 6264f5d..978e567 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
| @@ -897,15 +897,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 897 | Part.Name, Part.UUID, false); | 897 | Part.Name, Part.UUID, false); |
| 898 | 898 | ||
| 899 | 899 | ||
| 900 | m_log.DebugFormat( | 900 | m_log.Debug(string.Format( |
| 901 | "[SCRIPT INSTANCE]: Runtime error in script {0}, part {1} {2} at {3} in {4}, displayed error {5}, actual exception {6}", | 901 | "[SCRIPT INSTANCE]: Runtime error in script {0}, part {1} {2} at {3} in {4} ", |
| 902 | ScriptName, | 902 | ScriptName, |
| 903 | PrimName, | 903 | PrimName, |
| 904 | Part.UUID, | 904 | Part.UUID, |
| 905 | Part.AbsolutePosition, | 905 | Part.AbsolutePosition, |
| 906 | Part.ParentGroup.Scene.Name, | 906 | Part.ParentGroup.Scene.Name), |
| 907 | text.Replace("\n", "\\n"), | 907 | e); |
| 908 | e.InnerException); | ||
| 909 | } | 908 | } |
| 910 | catch (Exception) | 909 | catch (Exception) |
| 911 | { | 910 | { |
| @@ -1220,4 +1219,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 1220 | return null; | 1219 | return null; |
| 1221 | } | 1220 | } |
| 1222 | } | 1221 | } |
| 1223 | } \ No newline at end of file | 1222 | } |