From c6cef4bad5fe939b822687f521907c11c05a2bb3 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Thu, 4 Jun 2009 03:58:04 +0000 Subject: Comment out unused variables / private fields to avoid compiler warnings. --- .../UserServer.Modules/AvatarCreationModule.cs | 8 +++--- .../DynamicTexture/DynamicTextureModule.cs | 2 +- .../Server/IRCClientView.cs | 6 ++--- .../InternetRelayClientView/Server/IRCServer.cs | 2 -- .../AuthenticationServerConnector.cs | 7 +++-- .../Server/Handlers/Simulation/AgentHandlers.cs | 30 ++++++++++------------ .../Tests/Asset/AssetServerGetHandlerTests.cs | 12 ++++----- .../AuthenticationService/AuthenticationService.cs | 4 --- 8 files changed, 31 insertions(+), 40 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Grid/UserServer.Modules/AvatarCreationModule.cs b/OpenSim/Grid/UserServer.Modules/AvatarCreationModule.cs index 6077298..c443203 100644 --- a/OpenSim/Grid/UserServer.Modules/AvatarCreationModule.cs +++ b/OpenSim/Grid/UserServer.Modules/AvatarCreationModule.cs @@ -49,14 +49,14 @@ namespace OpenSim.Grid.UserServer.Modules private UserDataBaseService m_userDataBaseService; // private BaseHttpServer m_httpServer; - private UserConfig m_config; + // TODO: unused: private UserConfig m_config; private string m_inventoryServerUrl; private IInterServiceInventoryServices m_inventoryService; public AvatarCreationModule(UserDataBaseService userDataBaseService, UserConfig config, IInterServiceInventoryServices inventoryService) { - m_config = config; + // TODO: unused: m_config = config; m_userDataBaseService = userDataBaseService; m_inventoryService = inventoryService; m_inventoryServerUrl = config.InventoryUrl.OriginalString; @@ -124,8 +124,8 @@ namespace OpenSim.Grid.UserServer.Modules public bool CloneAvatar(Guid avatarID, Guid templateID, bool modifyPermissions, bool removeTargetsClothes) { m_log.InfoFormat("[AvatarAppearance] Starting to clone avatar {0} inventory to avatar {1}", templateID.ToString(), avatarID.ToString()); - Guid bodyFolder = Guid.Empty; - Guid clothesFolder = Guid.Empty; + // TODO: unused: Guid bodyFolder = Guid.Empty; + // TODO: unused: Guid clothesFolder = Guid.Empty; bool success = false; UUID avID = new UUID(avatarID); diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs index 366751b..2d9143a 100644 --- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs @@ -42,7 +42,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture { public class DynamicTextureModule : IRegionModule, IDynamicTextureManager { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private const int ALL_SIDES = -1; diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index daadb87..9c6c44d 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs @@ -320,9 +320,9 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server private void IRC_ProcessUser(string message) { string[] userArgs = ExtractParameters(message); - string username = userArgs[0]; - string hostname = userArgs[1]; - string servername = userArgs[2]; + // TODO: unused: string username = userArgs[0]; + // TODO: unused: string hostname = userArgs[1]; + // TODO: unused: string servername = userArgs[2]; string realname = userArgs[3].Replace(":", ""); m_username = realname; diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs index 43a28a2..91ce9f1 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs @@ -44,8 +44,6 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server /// class IRCServer { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - public event OnNewIRCUserDelegate OnNewIRCClient; private readonly TcpListener m_listener; diff --git a/OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs b/OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs index 07dea4a..c3c2f69 100644 --- a/OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs +++ b/OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs @@ -36,7 +36,7 @@ namespace OpenSim.Server.Handlers.Authentication { public class AuthenticationServiceConnector : ServiceConnector { - private IAuthenticationService m_AuthenticationService; + //private IAuthenticationService m_AuthenticationService; public AuthenticationServiceConnector(IConfigSource config, IHttpServer server) : base(config, server) @@ -51,9 +51,8 @@ namespace OpenSim.Server.Handlers.Authentication if (authenticationService == String.Empty) throw new Exception("No AuthenticationService in config file"); - Object[] args = new Object[] { config }; - m_AuthenticationService = - ServerUtils.LoadPlugin(authenticationService, args); + //Object[] args = new Object[] { config }; + //m_AuthenticationService = ServerUtils.LoadPlugin(authenticationService, args); //server.AddStreamHandler(new AuthenticationServerGetHandler(m_AuthenticationService)); } diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs index dd32ec9..c14ad99 100644 --- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs +++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs @@ -46,14 +46,14 @@ namespace OpenSim.Server.Handlers.Simulation { public class AgentGetHandler : BaseStreamHandler { - private ISimulationService m_SimulationService; - private IAuthenticationService m_AuthenticationService; + // TODO: unused: private ISimulationService m_SimulationService; + // TODO: unused: private IAuthenticationService m_AuthenticationService; public AgentGetHandler(ISimulationService service, IAuthenticationService authentication) : base("GET", "/agent") { - m_SimulationService = service; - m_AuthenticationService = authentication; + // TODO: unused: m_SimulationService = service; + // TODO: unused: m_AuthenticationService = authentication; } public override byte[] Handle(string path, Stream request, @@ -70,14 +70,14 @@ namespace OpenSim.Server.Handlers.Simulation private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private ISimulationService m_SimulationService; private IAuthenticationService m_AuthenticationService; - private bool m_AllowForeignGuests; + // TODO: unused: private bool m_AllowForeignGuests; public AgentPostHandler(ISimulationService service, IAuthenticationService authentication, bool foreignGuests) : base("POST", "/agent") { m_SimulationService = service; m_AuthenticationService = authentication; - m_AllowForeignGuests = foreignGuests; + // TODO: unused: m_AllowForeignGuests = foreignGuests; } public override byte[] Handle(string path, Stream request, @@ -160,20 +160,19 @@ namespace OpenSim.Server.Handlers.Simulation httpResponse.StatusCode = (int)HttpStatusCode.OK; return Encoding.UTF8.GetBytes(OSDParser.SerializeJsonString(resp)); - } } public class AgentPutHandler : BaseStreamHandler { - private ISimulationService m_SimulationService; - private IAuthenticationService m_AuthenticationService; + // TODO: unused: private ISimulationService m_SimulationService; + // TODO: unused: private IAuthenticationService m_AuthenticationService; public AgentPutHandler(ISimulationService service, IAuthenticationService authentication) : base("PUT", "/agent") { - m_SimulationService = service; - m_AuthenticationService = authentication; + // TODO: unused: m_SimulationService = service; + // TODO: unused: m_AuthenticationService = authentication; } public override byte[] Handle(string path, Stream request, @@ -187,14 +186,14 @@ namespace OpenSim.Server.Handlers.Simulation public class AgentDeleteHandler : BaseStreamHandler { - private ISimulationService m_SimulationService; - private IAuthenticationService m_AuthenticationService; + // TODO: unused: private ISimulationService m_SimulationService; + // TODO: unused: private IAuthenticationService m_AuthenticationService; public AgentDeleteHandler(ISimulationService service, IAuthenticationService authentication) : base("DELETE", "/agent") { - m_SimulationService = service; - m_AuthenticationService = authentication; + // TODO: unused: m_SimulationService = service; + // TODO: unused: m_AuthenticationService = authentication; } public override byte[] Handle(string path, Stream request, @@ -205,5 +204,4 @@ namespace OpenSim.Server.Handlers.Simulation return new byte[] { }; } } - } diff --git a/OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs b/OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs index aeca7b9..2615358 100644 --- a/OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs +++ b/OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs @@ -46,7 +46,7 @@ namespace OpenSim.Server.Handlers.Tests.Asset { TestHelper.InMethod(); - AssetServerGetHandler handler = new AssetServerGetHandler( null ); + AssetServerGetHandler handler = new AssetServerGetHandler(null); } [Test] @@ -54,7 +54,7 @@ namespace OpenSim.Server.Handlers.Tests.Asset { TestHelper.InMethod(); - AssetServerGetHandler handler = new AssetServerGetHandler(null); + AssetServerGetHandler handler = new AssetServerGetHandler(null); BaseRequestHandlerTestHelper.BaseTestGetParams(handler, ASSETS_PATH); } @@ -63,18 +63,18 @@ namespace OpenSim.Server.Handlers.Tests.Asset { TestHelper.InMethod(); - AssetServerGetHandler handler = new AssetServerGetHandler(null); + AssetServerGetHandler handler = new AssetServerGetHandler(null); BaseRequestHandlerTestHelper.BaseTestSplitParams(handler, ASSETS_PATH); } // TODO: unused - // private static AssetBase CreateTestEnvironment(out AssetServerGetHandler handler, out OSHttpResponse response) + // private static AssetBase CreateTestEnvironment(out AssetServerGetHandler handler, out OSHttpResponse response) // { // AssetBase asset = GetAssetStreamHandlerTestHelpers.CreateCommonTestResources(out response); // IAssetService assetDataPlugin = new TestAssetService(); - // handler = new AssetServerGetHandler(assetDataPlugin); + // handler = new AssetServerGetHandler(assetDataPlugin); // assetDataPlugin.Store(asset); // return asset; // } } -} \ No newline at end of file +} diff --git a/OpenSim/Services/AuthenticationService/AuthenticationService.cs b/OpenSim/Services/AuthenticationService/AuthenticationService.cs index a72236e..3eaa03d 100644 --- a/OpenSim/Services/AuthenticationService/AuthenticationService.cs +++ b/OpenSim/Services/AuthenticationService/AuthenticationService.cs @@ -39,10 +39,6 @@ namespace OpenSim.Services.AuthenticationService { public class AuthenticationService : ServiceBase, IAuthenticationService { - private static readonly ILog m_log = - LogManager.GetLogger( - MethodBase.GetCurrentMethod().DeclaringType); - public AuthenticationService(IConfigSource config) : base(config) { } -- cgit v1.1