From 36e648a37aac3d169dbf28ce14c75f488da8a11e Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Wed, 25 Feb 2009 20:53:02 +0000 Subject: [PATCH] * minor: Remove most mono compiler warnings --- OpenSim/Client/MXP/MXPModule.cs | 2 +- OpenSim/Data/Tests/BasicAssetTest.cs | 2 +- OpenSim/Data/Tests/BasicEstateTest.cs | 2 +- OpenSim/Data/Tests/BasicGridTest.cs | 2 +- OpenSim/Data/Tests/BasicInventoryTest.cs | 2 +- OpenSim/Data/Tests/BasicUserTest.cs | 2 +- .../AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs | 4 ++-- OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs | 6 +++--- OpenSim/Grid/GridServer.Modules/GridRestModule.cs | 4 ++-- .../UserServer.Modules/UserServerAvatarAppearanceModule.cs | 2 +- OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs | 2 +- OpenSim/Grid/UserServer/UserServerCommandModule.cs | 2 ++ OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs | 5 +++-- .../Communications/Hypergrid/HGGridServicesGridMode.cs | 2 +- .../Communications/Hypergrid/HGGridServicesStandalone.cs | 2 +- OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 4 ++-- OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs | 2 +- OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | 2 +- 18 files changed, 26 insertions(+), 23 deletions(-) diff --git a/OpenSim/Client/MXP/MXPModule.cs b/OpenSim/Client/MXP/MXPModule.cs index 552c3b7100..581239f06b 100644 --- a/OpenSim/Client/MXP/MXPModule.cs +++ b/OpenSim/Client/MXP/MXPModule.cs @@ -41,7 +41,7 @@ namespace OpenSim.Client.MXP public class MXPModule : IRegionModule { private int mxp_Port = 1253; - private double mxp_BubbleRadius = 181.01933598375616624661615669884; // Radius of a sphere big enough to encapsulate a 256x256 square + //private double mxp_BubbleRadius = 181.01933598375616624661615669884; // Radius of a sphere big enough to encapsulate a 256x256 square private readonly Timer ticker = new Timer(100); diff --git a/OpenSim/Data/Tests/BasicAssetTest.cs b/OpenSim/Data/Tests/BasicAssetTest.cs index e7faebb471..2a70711484 100644 --- a/OpenSim/Data/Tests/BasicAssetTest.cs +++ b/OpenSim/Data/Tests/BasicAssetTest.cs @@ -38,7 +38,7 @@ namespace OpenSim.Data.Tests { public class BasicAssetTest { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); public AssetDataBase db; public UUID uuid1; public UUID uuid2; diff --git a/OpenSim/Data/Tests/BasicEstateTest.cs b/OpenSim/Data/Tests/BasicEstateTest.cs index f74a222252..0b24fdea02 100644 --- a/OpenSim/Data/Tests/BasicEstateTest.cs +++ b/OpenSim/Data/Tests/BasicEstateTest.cs @@ -40,7 +40,7 @@ namespace OpenSim.Data.Tests { public class BasicEstateTest { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); public IEstateDataStore db; public IRegionDataStore regionDb; diff --git a/OpenSim/Data/Tests/BasicGridTest.cs b/OpenSim/Data/Tests/BasicGridTest.cs index 8841bae941..86c3115adb 100644 --- a/OpenSim/Data/Tests/BasicGridTest.cs +++ b/OpenSim/Data/Tests/BasicGridTest.cs @@ -39,7 +39,7 @@ namespace OpenSim.Data.Tests { public class BasicGridTest { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); public GridDataBase db; public UUID region1, region2, region3; public UUID zero = UUID.Zero; diff --git a/OpenSim/Data/Tests/BasicInventoryTest.cs b/OpenSim/Data/Tests/BasicInventoryTest.cs index e5642f18fb..65c61cd99c 100644 --- a/OpenSim/Data/Tests/BasicInventoryTest.cs +++ b/OpenSim/Data/Tests/BasicInventoryTest.cs @@ -38,7 +38,7 @@ namespace OpenSim.Data.Tests { public class BasicInventoryTest { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); public IInventoryDataPlugin db; public UUID zero = UUID.Zero; diff --git a/OpenSim/Data/Tests/BasicUserTest.cs b/OpenSim/Data/Tests/BasicUserTest.cs index 151faa21bf..82ff08b781 100644 --- a/OpenSim/Data/Tests/BasicUserTest.cs +++ b/OpenSim/Data/Tests/BasicUserTest.cs @@ -42,7 +42,7 @@ namespace OpenSim.Data.Tests { public class BasicUserTest { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); public IUserDataPlugin db; public UUID user1; public UUID user2; diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs index 6430e2a7ac..6e7519d104 100644 --- a/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs +++ b/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs @@ -42,7 +42,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins public class BrowseFrontendPlugin : IAssetInventoryServerPlugin { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - private AssetInventoryServer m_server; + //private AssetInventoryServer m_server; public BrowseFrontendPlugin() { @@ -52,7 +52,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins public void Initialise(AssetInventoryServer server) { - m_server = server; + //m_server = server; // Request for / or /?... //m_server.HttpServer.AddStreamHandler(new BrowseRequestHandler(server)); diff --git a/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs b/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs index c3b722c824..8ae19a9b98 100644 --- a/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs +++ b/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs @@ -40,7 +40,7 @@ namespace OpenSim.Grid.GridServer.Modules { public class GridMessagingModule : IMessagingServerDiscovery { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); protected GridDBService m_gridDBService; protected IGridServiceCore m_gridCore; @@ -50,7 +50,7 @@ namespace OpenSim.Grid.GridServer.Modules /// /// Used to notify old regions as to which OpenSim version to upgrade to /// - private string m_opensimVersion; + //private string m_opensimVersion; protected BaseHttpServer m_httpServer; @@ -63,7 +63,7 @@ namespace OpenSim.Grid.GridServer.Modules public void Initialise(string opensimVersion, GridDBService gridDBService, IGridServiceCore gridCore, GridConfig config) { - m_opensimVersion = opensimVersion; + //m_opensimVersion = opensimVersion; m_gridDBService = gridDBService; m_gridCore = gridCore; m_config = config; diff --git a/OpenSim/Grid/GridServer.Modules/GridRestModule.cs b/OpenSim/Grid/GridServer.Modules/GridRestModule.cs index 95fa706721..7df6514504 100644 --- a/OpenSim/Grid/GridServer.Modules/GridRestModule.cs +++ b/OpenSim/Grid/GridServer.Modules/GridRestModule.cs @@ -53,7 +53,7 @@ namespace OpenSim.Grid.GridServer.Modules /// /// Used to notify old regions as to which OpenSim version to upgrade to /// - private string m_opensimVersion; + //private string m_opensimVersion; protected BaseHttpServer m_httpServer; @@ -69,7 +69,7 @@ namespace OpenSim.Grid.GridServer.Modules public void Initialise(string opensimVersion, GridDBService gridDBService, IGridServiceCore gridCore, GridConfig config) { - m_opensimVersion = opensimVersion; + //m_opensimVersion = opensimVersion; m_gridDBService = gridDBService; m_gridCore = gridCore; m_config = config; diff --git a/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs b/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs index a5a630e6d2..a53dee7316 100644 --- a/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs +++ b/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs @@ -41,7 +41,7 @@ namespace OpenSim.Grid.UserServer.Modules { public class UserServerAvatarAppearanceModule { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private UserDataBaseService m_userDataBaseService; private BaseHttpServer m_httpServer; diff --git a/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs b/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs index 49e94ee2af..8fc474fcf1 100644 --- a/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs +++ b/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs @@ -41,7 +41,7 @@ namespace OpenSim.Grid.UserServer.Modules { public class UserServerFriendsModule { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private UserDataBaseService m_userDataBaseService; diff --git a/OpenSim/Grid/UserServer/UserServerCommandModule.cs b/OpenSim/Grid/UserServer/UserServerCommandModule.cs index 7f7108c0e8..f73b3deb32 100644 --- a/OpenSim/Grid/UserServer/UserServerCommandModule.cs +++ b/OpenSim/Grid/UserServer/UserServerCommandModule.cs @@ -241,10 +241,12 @@ namespace OpenSim.Grid.UserServer m_userDataBaseService.ResetUserPassword(firstName, lastName, newPassword); } + /* private void HandleTestCommand(string module, string[] cmd) { m_log.Info("test command received"); } + */ private void HandleLoginCommand(string module, string[] cmd) { diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs index 427022295e..58777ab67d 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs @@ -122,11 +122,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP public event PacketStats OnPacketStats; public event PacketDrop OnPacketDrop; - private SynchronizeClientHandler m_SynchronizeClient = null; + + //private SynchronizeClientHandler m_SynchronizeClient = null; public SynchronizeClientHandler SynchronizeClient { - set { m_SynchronizeClient = value; } + set { /* m_SynchronizeClient = value; */ } } // Packet sequencing diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs index 85fb4b78e4..2434d9249a 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs @@ -41,7 +41,7 @@ namespace OpenSim.Region.Communications.Hypergrid { public class HGGridServicesGridMode : HGGridServices { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); /// /// Encapsulate remote backend services for manipulation of grid regions diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs index 36d4b99718..aa2a2757fd 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs @@ -56,7 +56,7 @@ namespace OpenSim.Region.Communications.Hypergrid /// protected LocalBackEndServices m_localBackend = new LocalBackEndServices(); - private Dictionary m_deadRegionCache = new Dictionary(); + //private Dictionary m_deadRegionCache = new Dictionary(); public LocalBackEndServices LocalBackend { diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index d2d4acdbf8..45ecdc5ca2 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs @@ -426,7 +426,7 @@ namespace OpenSim.Region.Framework.Scenes throw new Exception("This constructor must specify the xml is in OpenSim's original format"); //m_log.DebugFormat("[SOG]: Starting deserialization of SOG"); - int time = System.Environment.TickCount; + //int time = System.Environment.TickCount; // libomv.types changes UUID to Guid xmlData = xmlData.Replace("", ""); @@ -769,7 +769,7 @@ namespace OpenSim.Region.Framework.Scenes public void ToXml2(XmlTextWriter writer) { //m_log.DebugFormat("[SOG]: Starting serialization of SOG {0} to XML2", Name); - int time = System.Environment.TickCount; + //int time = System.Environment.TickCount; writer.WriteStartElement(String.Empty, "SceneObjectGroup", String.Empty); m_rootPart.ToXml(writer); diff --git a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs index 55798481ef..120eed9152 100644 --- a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs +++ b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs @@ -42,7 +42,7 @@ namespace OpenSim.Region.Physics.PhysXPlugin /// public class PhysXPlugin : IPhysicsPlugin { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private PhysXScene _mScene; public PhysXPlugin() diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs index 5d5e3c5e86..041e751fba 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs @@ -622,7 +622,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools fs.Read(data, 0, data.Length); fs.Close(); } - catch (Exception e) + catch (Exception) { string errtext = String.Empty; errtext += "No compile error. But not able to open file.";