From 451bd5a0ca87987759d82df681b66da499d41191 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey <jjustincc@googlemail.com>
Date: Sun, 21 Sep 2008 20:56:39 +0000
Subject: [PATCH] * minor: warnings removal

---
 .../ScriptEngine/ComponentLoader.cs           |  4 +--
 .../ScriptEngine/RegionScriptEngineBase.cs    |  2 +-
 .../ScriptEngine/RegionScriptEnginePlugin.cs  | 28 +++++++++----------
 OpenSim/Data/Tests/BasicRegionTest.cs         |  2 +-
 .../Region/ScriptEngine/Common/LSL_Types.cs   |  2 +-
 .../Region/ScriptEngine/Shared/LSL_Types.cs   |  2 +-
 6 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/ComponentLoader.cs b/OpenSim/ApplicationPlugins/ScriptEngine/ComponentLoader.cs
index 0aa0525056..d2e3cd09ca 100644
--- a/OpenSim/ApplicationPlugins/ScriptEngine/ComponentLoader.cs
+++ b/OpenSim/ApplicationPlugins/ScriptEngine/ComponentLoader.cs
@@ -40,10 +40,10 @@ namespace OpenSim.ApplicationPlugins.ScriptEngine
     internal class ComponentLoader
     {
         internal static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private ScriptEnginePlugin scriptEnginePlugin;
+        //private ScriptEnginePlugin scriptEnginePlugin;
         public ComponentLoader(ScriptEnginePlugin sep)
         {
-            scriptEnginePlugin = sep;
+            //scriptEnginePlugin = sep;
         }
 
         /// <summary>
diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEngineBase.cs b/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEngineBase.cs
index e2731d7942..89a90ae8ca 100644
--- a/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEngineBase.cs
+++ b/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEngineBase.cs
@@ -171,7 +171,7 @@ namespace OpenSim.ApplicationPlugins.ScriptEngine
                 {
                     p.Close();
                 }
-                catch (Exception ex)
+                catch (Exception)
                 {
                     // TODO: Print error to console
                 }
diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEnginePlugin.cs b/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEnginePlugin.cs
index d5301473c1..e6def851a0 100644
--- a/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEnginePlugin.cs
+++ b/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEnginePlugin.cs
@@ -46,20 +46,20 @@ namespace OpenSim.ApplicationPlugins.ScriptEngine
             return;
             // New region is being created
             // Create a new script engine
-            try
-            {
-                lock (ComponentRegistry.scriptEngines)
-                {
-                    scriptEngine =
-                        Activator.CreateInstance(ComponentRegistry.scriptEngines[tempScriptEngineName]) as
-                        RegionScriptEngineBase;
-                }
-                scriptEngine.Initialize(scene, source);
-            }
-            catch (Exception ex)
-            {
-                scriptEngine.m_log.Error("[ScriptEngine]: Unable to load engine \"" + tempScriptEngineName + "\": " + ex.ToString());
-            }
+//            try
+//            {
+//                lock (ComponentRegistry.scriptEngines)
+//                {
+//                    scriptEngine =
+//                        Activator.CreateInstance(ComponentRegistry.scriptEngines[tempScriptEngineName]) as
+//                        RegionScriptEngineBase;
+//                }
+//                scriptEngine.Initialize(scene, source);
+//            }
+//            catch (Exception ex)
+//            {
+//                scriptEngine.m_log.Error("[ScriptEngine]: Unable to load engine \"" + tempScriptEngineName + "\": " + ex.ToString());
+//            }
         }
 
         public void PostInitialise()
diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs
index 535ac7480e..f9c5565091 100644
--- a/OpenSim/Data/Tests/BasicRegionTest.cs
+++ b/OpenSim/Data/Tests/BasicRegionTest.cs
@@ -145,7 +145,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T300_NoTerrain()
         {
-            double[,] t1 = db.LoadTerrain(region1);
+            db.LoadTerrain(region1);
         }
 
         [Test]
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
index 5bfe8bf8ca..bff2101131 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
@@ -1373,7 +1373,7 @@ namespace OpenSim.Region.ScriptEngine.Common
                             value = int.Parse(v, System.Globalization.NumberStyles.Integer);
                         }
                     }
-                    catch (OverflowException oe)
+                    catch (OverflowException)
                     {
                         value = -1;
                     }
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index d107d908a1..b8d72e01e9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
@@ -1455,7 +1455,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
                             value = int.Parse(v,
                                    System.Globalization.NumberStyles.Integer);
                     }
-                    catch (OverflowException oe)
+                    catch (OverflowException)
                     {
                         value = -1;
                     }