diff options
author | Melanie Thielker | 2008-10-11 16:32:31 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-10-11 16:32:31 +0000 |
commit | 44b2ecf29db58bfdc3ecf0682cec9fc6e94dd4ee (patch) | |
tree | f222a1c831a4a40bfc81df721681da95c0a96c60 /OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |
parent | Fix Nebadon's WP crash (invalid root part from database null-ref) (diff) | |
download | opensim-SC-44b2ecf29db58bfdc3ecf0682cec9fc6e94dd4ee.zip opensim-SC-44b2ecf29db58bfdc3ecf0682cec9fc6e94dd4ee.tar.gz opensim-SC-44b2ecf29db58bfdc3ecf0682cec9fc6e94dd4ee.tar.bz2 opensim-SC-44b2ecf29db58bfdc3ecf0682cec9fc6e94dd4ee.tar.xz |
2nd stab at that prim loading nasty
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 1d20377..9d07de2 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
@@ -35,7 +35,7 @@ using System.Reflection; | |||
35 | using System.Globalization; | 35 | using System.Globalization; |
36 | using System.Xml; | 36 | using System.Xml; |
37 | using OpenMetaverse; | 37 | using OpenMetaverse; |
38 | //using log4net; | 38 | using log4net; |
39 | using Nini.Config; | 39 | using Nini.Config; |
40 | using Amib.Threading; | 40 | using Amib.Threading; |
41 | using OpenSim.Framework; | 41 | using OpenSim.Framework; |
@@ -52,7 +52,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
52 | { | 52 | { |
53 | public class ScriptInstance : IScriptInstance | 53 | public class ScriptInstance : IScriptInstance |
54 | { | 54 | { |
55 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 55 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
56 | 56 | ||
57 | private IScriptEngine m_Engine; | 57 | private IScriptEngine m_Engine; |
58 | private IScriptWorkItem m_CurrentResult = null; | 58 | private IScriptWorkItem m_CurrentResult = null; |
@@ -843,7 +843,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
843 | } | 843 | } |
844 | } | 844 | } |
845 | 845 | ||
846 | return message; | 846 | m_log.ErrorFormat("Scripting exception:"); |
847 | m_log.ErrorFormat(e.ToString()); | ||
848 | |||
849 | return e.ToString(); | ||
847 | } | 850 | } |
848 | } | 851 | } |
849 | } | 852 | } |