From 4692e92312ceacf414629eb78f6d0725a2eb2ca5 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Thu, 1 May 2008 14:45:56 +0000
Subject: * Assorted spring cleanings.

---
 OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs          | 4 ++--
 OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs | 1 -
 .../ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs       | 6 ++++--
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine')

diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 0773253..31ca3f3 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -3074,7 +3074,7 @@ namespace OpenSim.Region.ScriptEngine.Common
 			{
 				return Convert.ToInt32(src.Data[index]);
 			}
-			catch (System.FormatException e)
+			catch (FormatException e)
 			{
 				return 0;
 			}
@@ -3109,7 +3109,7 @@ namespace OpenSim.Region.ScriptEngine.Common
 			{
 				return Convert.ToDouble(src.Data[index]);
 			}
-			catch (System.FormatException e)
+			catch (FormatException e)
 			{
 				return 0.0;
 			}
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 @@
 using System;
 using libsecondlife;
 using OpenSim.Framework;
-using OpenSim.Region.Environment;
 using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney;
 using OpenSim.Region.Environment.Scenes;
 
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 @@
 
 using System;
 using System.Collections;
+using System.Reflection;
 using System.Threading;
+using log4net;
 using OpenSim.Framework;
 
 namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
@@ -38,7 +40,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
     public class MaintenanceThread : iScriptEngineFunctionModule
     {
         
-        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         //public ScriptEngine m_ScriptEngine;
         private int MaintenanceLoopms;
@@ -216,7 +218,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
                         //}
                     }
                 }
-                catch(System.Threading.ThreadAbortException ex)
+                catch(ThreadAbortException ex)
                 {
                     m_log.Error("Thread aborted in MaintenanceLoopThread.  If this is during shutdown, please ignore");
                 }
-- 
cgit v1.1