diff options
author | Adam Frisby | 2008-05-01 14:45:56 +0000 |
---|---|---|
committer | Adam Frisby | 2008-05-01 14:45:56 +0000 |
commit | 4692e92312ceacf414629eb78f6d0725a2eb2ca5 (patch) | |
tree | 34da13ca5f7f19fc447f4fd341a43703183cfd55 /OpenSim/Region/ScriptEngine/Common/ScriptEngineBase | |
parent | Update svn properties. Minor formatting cleanup. (diff) | |
download | opensim-SC_OLD-4692e92312ceacf414629eb78f6d0725a2eb2ca5.zip opensim-SC_OLD-4692e92312ceacf414629eb78f6d0725a2eb2ca5.tar.gz opensim-SC_OLD-4692e92312ceacf414629eb78f6d0725a2eb2ca5.tar.bz2 opensim-SC_OLD-4692e92312ceacf414629eb78f6d0725a2eb2ca5.tar.xz |
* Assorted spring cleanings.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs index 261f862..77a4048 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs | |||
@@ -28,7 +28,6 @@ | |||
28 | using System; | 28 | using System; |
29 | using libsecondlife; | 29 | using libsecondlife; |
30 | using OpenSim.Framework; | 30 | using OpenSim.Framework; |
31 | using OpenSim.Region.Environment; | ||
32 | using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney; | 31 | using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney; |
33 | using OpenSim.Region.Environment.Scenes; | 32 | using OpenSim.Region.Environment.Scenes; |
34 | 33 | ||
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs index 458bd4c..3e9fc65 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs | |||
@@ -27,7 +27,9 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Reflection; | ||
30 | using System.Threading; | 31 | using System.Threading; |
32 | using log4net; | ||
31 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
32 | 34 | ||
33 | namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | 35 | namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase |
@@ -38,7 +40,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
38 | public class MaintenanceThread : iScriptEngineFunctionModule | 40 | public class MaintenanceThread : iScriptEngineFunctionModule |
39 | { | 41 | { |
40 | 42 | ||
41 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
42 | 44 | ||
43 | //public ScriptEngine m_ScriptEngine; | 45 | //public ScriptEngine m_ScriptEngine; |
44 | private int MaintenanceLoopms; | 46 | private int MaintenanceLoopms; |
@@ -216,7 +218,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
216 | //} | 218 | //} |
217 | } | 219 | } |
218 | } | 220 | } |
219 | catch(System.Threading.ThreadAbortException ex) | 221 | catch(ThreadAbortException ex) |
220 | { | 222 | { |
221 | m_log.Error("Thread aborted in MaintenanceLoopThread. If this is during shutdown, please ignore"); | 223 | m_log.Error("Thread aborted in MaintenanceLoopThread. If this is during shutdown, please ignore"); |
222 | } | 224 | } |