diff options
| author | UbitUmarov | 2017-05-25 10:23:52 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-05-25 10:23:52 +0100 |
| commit | 27779953315e160067080b6f17945ab54695d63f (patch) | |
| tree | 36e66eeaf84fd48382ab89278c7b150723a45235 /OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |
| parent | merge master (diff) | |
| parent | add some checks for valid endpoints (diff) | |
| download | opensim-SC-27779953315e160067080b6f17945ab54695d63f.zip opensim-SC-27779953315e160067080b6f17945ab54695d63f.tar.gz opensim-SC-27779953315e160067080b6f17945ab54695d63f.tar.bz2 opensim-SC-27779953315e160067080b6f17945ab54695d63f.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to '')
| -rwxr-xr-x | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 2e39033..c1abba2 100755 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
| @@ -1079,6 +1079,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 1079 | "[XEngine]: Started {0} scripts in {1}", scriptsStarted, m_Scene.Name); | 1079 | "[XEngine]: Started {0} scripts in {1}", scriptsStarted, m_Scene.Name); |
| 1080 | } | 1080 | } |
| 1081 | } | 1081 | } |
| 1082 | catch (System.Threading.ThreadAbortException) { } | ||
| 1082 | catch (Exception e) | 1083 | catch (Exception e) |
| 1083 | { | 1084 | { |
| 1084 | m_log.Error( | 1085 | m_log.Error( |