From 163c1026d15a8f70c649d8d5880cf9fb4abb9a65 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Fri, 13 Feb 2009 02:52:08 +0000 Subject: Fix some compiler warnings. Minor formatting cleanup. --- OpenSim/Region/ScriptEngine/DotNetEngine/MaintenanceThread.cs | 1 - OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs | 4 ---- OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 8 ++++---- OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs | 4 ++-- 4 files changed, 6 insertions(+), 11 deletions(-) (limited to 'OpenSim/Region/ScriptEngine') diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/MaintenanceThread.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/MaintenanceThread.cs index c0a3c4d..49e87c0 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/MaintenanceThread.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/MaintenanceThread.cs @@ -39,7 +39,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine /// public class MaintenanceThread { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); //public ScriptEngine m_ScriptEngine; diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs index 3de3aad..0c06630 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs @@ -505,7 +505,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine return 0; } - #endregion #region Internal functions to keep track of script @@ -591,7 +590,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine StartScript(localID, itemID, script, id.StartParam, false); } - #region Script serialization/deserialization public void GetSerializedScript(uint localID, UUID itemID) @@ -623,9 +621,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine public int GetStartParameter(UUID itemID) { - uint localID = GetLocalID(itemID); - InstanceData id = GetScript(localID, itemID); if (id == null) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 69ac517..cd17399 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -361,12 +361,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public LSL_Integer llAbs(int i) { - // changed to replicate LSL behaviour whereby minimum int value is returned untouched. + // changed to replicate LSL behaviour whereby minimum int value is returned untouched. m_host.AddScriptLPS(1); - if(i == Int32.MinValue) - return i; + if (i == Int32.MinValue) + return i; else - return (int)Math.Abs(i); + return (int)Math.Abs(i); } public LSL_Float llFabs(double f) diff --git a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs index 17d26ef..663b0ca 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs @@ -47,7 +47,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine.Tests public static Random random; public TestClient testclient; - TestCommunicationsManager cm; + //TestCommunicationsManager cm; [TestFixtureSetUp] public void Init() @@ -65,4 +65,4 @@ namespace OpenSim.Region.ScriptEngine.XEngine.Tests xengine.PostInitialise(); } } -} \ No newline at end of file +} -- cgit v1.1