From 415fc22e5ea326dd104563044533d14d08612f5c Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Mon, 3 Mar 2008 09:54:39 +0000 Subject: [PATCH] * Removed a bunch of compiler warnings. --- OpenSim/Grid/ScriptServer/ScriptServerMain.cs | 2 +- OpenSim/Region/ClientStack/UDPServer.cs | 2 +- OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 1 - .../Environment/Modules/Terrain/PaintBrushes/FlattenSphere.cs | 1 - OpenSim/Region/Environment/Scenes/SceneBase.cs | 2 +- OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 1 - OpenSim/Region/ScriptEngine/Common/LSL_Types.cs | 2 +- .../ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs | 2 +- .../Common/ScriptEngineBase/EventQueueThreadClass.cs | 2 +- .../ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs | 2 +- OpenSim/Tests/Common/TestHelper.cs | 2 +- 11 files changed, 8 insertions(+), 11 deletions(-) diff --git a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs index 75a4543d34..ff063f6d68 100644 --- a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs +++ b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs @@ -67,7 +67,7 @@ namespace OpenSim.Grid.ScriptServer // Load DotNetEngine Engine = ScriptEngines.LoadEngine("DotNetEngine"); - IConfigSource config = null; + Engine.InitializeEngine(null, null, false, Engine.GetScriptManager()); diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs index e3b482f30b..9c572cf44a 100644 --- a/OpenSim/Region/ClientStack/UDPServer.cs +++ b/OpenSim/Region/ClientStack/UDPServer.cs @@ -359,7 +359,7 @@ namespace OpenSim.Region.ClientStack throw (ex); // We are looking for alternate ports! - m_log.Info("[SERVER]: UDP socket on " + listenIP.ToString() + " " + listenPort.ToString() + " is not available, trying next."); + //m_log.Info("[SERVER]: UDP socket on " + listenIP.ToString() + " " + listenPort.ToString() + " is not available, trying next."); } System.Threading.Thread.Sleep(100); // Wait before we retry socket } diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index 33b5f36996..12c91acfd2 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs @@ -1255,7 +1255,6 @@ namespace OpenSim.Region.Communications.OGS1 m_log.Error("Remoting Error: Unable to connect to adjacent region.\n" + e.ToString()); return false; } - return false; } /// diff --git a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/FlattenSphere.cs b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/FlattenSphere.cs index f02a8dde61..186147bf54 100644 --- a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/FlattenSphere.cs +++ b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/FlattenSphere.cs @@ -77,7 +77,6 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes int x, y; double[,] tweak = new double[map.Width, map.Height]; - double n, l; double area = strength; double step = strength / 4.0; diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs index 2a2dea1736..9ee5e0ebb6 100644 --- a/OpenSim/Region/Environment/Scenes/SceneBase.cs +++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs @@ -112,7 +112,7 @@ namespace OpenSim.Region.Environment.Scenes /// Client to send to public virtual void SendLayerData(IClientAPI RemoteClient) { - bool usingTerrainModule = false; + bool usingTerrainModule = true; if (usingTerrainModule) { diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index 78d3a3fd2c..32c641464a 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs @@ -3494,7 +3494,6 @@ namespace OpenSim.Region.ScriptEngine.Common int number = 0; int digit; - int baddigit = 0; m_host.AddScriptLPS(1); diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs index f3e57c4df1..ca2136b4e4 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs @@ -616,7 +616,7 @@ namespace OpenSim.Region.ScriptEngine.Common { list j = this; j.NumericSort(); - double ret; + if (Math.Ceiling(this.Length * i) == this.Length * i) { return (double)((double)j.Data[(int)(this.Length * i - 1)] + (double)j.Data[(int)(this.Length * i)]) / 2; diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs index 825686b6ea..c3f6168e59 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs @@ -245,7 +245,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase { threadClass.Stop(); } - catch (Exception ex) + catch (Exception) { //m_ScriptEngine.Log.Error("[" + m_ScriptEngine.ScriptEngineName + ":EventQueueManager]: If you see this, could you please report it to Tedd:"); //m_ScriptEngine.Log.Error("[" + m_ScriptEngine.ScriptEngineName + ":EventQueueManager]: Script thread execution timeout kill ended in exception: " + ex.ToString()); diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs index 3a237da3d7..ebb4795aa3 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs @@ -169,7 +169,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase DoProcessQueue(); } } - catch (ThreadAbortException tae) + catch (ThreadAbortException) { if (lastScriptEngine != null) lastScriptEngine.Log.Info("[" + ScriptEngineName + "]: ThreadAbortException while executing function."); diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs index 0fcabab723..78ebecdffb 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs @@ -116,7 +116,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase MaintenanceThreadThread.Abort(); } } - catch (Exception ex) + catch (Exception) { //m_ScriptEngine.Log.Error("[" + m_ScriptEngine.ScriptEngineName + "]: Exception stopping maintenence thread: " + ex.ToString()); } diff --git a/OpenSim/Tests/Common/TestHelper.cs b/OpenSim/Tests/Common/TestHelper.cs index 1ec9e65ec7..2c5276368b 100644 --- a/OpenSim/Tests/Common/TestHelper.cs +++ b/OpenSim/Tests/Common/TestHelper.cs @@ -42,7 +42,7 @@ namespace OpenSim.Tests.Common { d(); } - catch(ArgumentException e) + catch(ArgumentException) { return true; }