From bf5ec8cb88219c8fefd7b396d5bd03110d3fa0e5 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Fri, 21 Jan 2011 22:51:52 +0000 Subject: [PATCH] remove some mono compiler warnings and unnecessary dictionary instantiations --- .../Server/Handlers/Grid/GridInfoServerInConnector.cs | 2 +- OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs | 3 ++- .../Handlers/Hypergrid/GatekeeperServerConnector.cs | 6 +++--- .../Handlers/Hypergrid/UserAgentServerConnector.cs | 6 +++--- .../Server/Handlers/Inventory/XInventoryInConnector.cs | 9 --------- .../Handlers/Presence/PresenceServerPostHandler.cs | 2 -- .../Handlers/Simulation/SimulationServiceInConnector.cs | 2 +- 7 files changed, 10 insertions(+), 20 deletions(-) diff --git a/OpenSim/Server/Handlers/Grid/GridInfoServerInConnector.cs b/OpenSim/Server/Handlers/Grid/GridInfoServerInConnector.cs index c9e80d980e..8472d34f1c 100644 --- a/OpenSim/Server/Handlers/Grid/GridInfoServerInConnector.cs +++ b/OpenSim/Server/Handlers/Grid/GridInfoServerInConnector.cs @@ -39,7 +39,7 @@ namespace OpenSim.Server.Handlers.Grid { public class GridInfoServerInConnector : ServiceConnector { - private string m_ConfigName = "GridInfoService"; +// private string m_ConfigName = "GridInfoService"; public GridInfoServerInConnector(IConfigSource config, IHttpServer server, string configName) : base(config, server, configName) diff --git a/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs index 31eefb1a6e..f3f81b07c9 100644 --- a/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs +++ b/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs @@ -51,7 +51,8 @@ namespace OpenSim.Server.Handlers.Hypergrid { public class GatekeeperAgentHandler : OpenSim.Server.Handlers.Simulation.AgentHandler { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); +// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + private IGatekeeperService m_GatekeeperService; public GatekeeperAgentHandler(IGatekeeperService gatekeeper, bool proxy) diff --git a/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs index 49de8b1c66..3d0967f2de 100644 --- a/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs +++ b/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs @@ -41,9 +41,9 @@ namespace OpenSim.Server.Handlers.Hypergrid { public class GatekeeperServiceInConnector : ServiceConnector { - private static readonly ILog m_log = - LogManager.GetLogger( - MethodBase.GetCurrentMethod().DeclaringType); +// private static readonly ILog m_log = +// LogManager.GetLogger( +// MethodBase.GetCurrentMethod().DeclaringType); private IGatekeeperService m_GatekeeperService; public IGatekeeperService GateKeeper diff --git a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs index e5f6a5def5..0e8ce800a7 100644 --- a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs +++ b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs @@ -47,9 +47,9 @@ namespace OpenSim.Server.Handlers.Hypergrid { public class UserAgentServerConnector : ServiceConnector { - private static readonly ILog m_log = - LogManager.GetLogger( - MethodBase.GetCurrentMethod().DeclaringType); +// private static readonly ILog m_log = +// LogManager.GetLogger( +// MethodBase.GetCurrentMethod().DeclaringType); private IUserAgentService m_HomeUsersService; diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs index 00f035c883..899f9c0979 100644 --- a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs +++ b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs @@ -347,7 +347,6 @@ namespace OpenSim.Server.Handlers.Asset byte[] HandleAddFolder(Dictionary request) { - Dictionary result = new Dictionary(); InventoryFolderBase folder = BuildFolder(request); if (m_InventoryService.AddFolder(folder)) @@ -358,7 +357,6 @@ namespace OpenSim.Server.Handlers.Asset byte[] HandleUpdateFolder(Dictionary request) { - Dictionary result = new Dictionary(); InventoryFolderBase folder = BuildFolder(request); if (m_InventoryService.UpdateFolder(folder)) @@ -369,7 +367,6 @@ namespace OpenSim.Server.Handlers.Asset byte[] HandleMoveFolder(Dictionary request) { - Dictionary result = new Dictionary(); UUID parentID = UUID.Zero; UUID.TryParse(request["ParentID"].ToString(), out parentID); UUID folderID = UUID.Zero; @@ -387,7 +384,6 @@ namespace OpenSim.Server.Handlers.Asset byte[] HandleDeleteFolders(Dictionary request) { - Dictionary result = new Dictionary(); UUID principal = UUID.Zero; UUID.TryParse(request["PRINCIPAL"].ToString(), out principal); List slist = (List)request["FOLDERS"]; @@ -408,7 +404,6 @@ namespace OpenSim.Server.Handlers.Asset byte[] HandlePurgeFolder(Dictionary request) { - Dictionary result = new Dictionary(); UUID folderID = UUID.Zero; UUID.TryParse(request["ID"].ToString(), out folderID); @@ -421,7 +416,6 @@ namespace OpenSim.Server.Handlers.Asset byte[] HandleAddItem(Dictionary request) { - Dictionary result = new Dictionary(); InventoryItemBase item = BuildItem(request); if (m_InventoryService.AddItem(item)) @@ -432,7 +426,6 @@ namespace OpenSim.Server.Handlers.Asset byte[] HandleUpdateItem(Dictionary request) { - Dictionary result = new Dictionary(); InventoryItemBase item = BuildItem(request); if (m_InventoryService.UpdateItem(item)) @@ -443,7 +436,6 @@ namespace OpenSim.Server.Handlers.Asset byte[] HandleMoveItems(Dictionary request) { - Dictionary result = new Dictionary(); List idlist = (List)request["IDLIST"]; List destlist = (List)request["DESTLIST"]; UUID principal = UUID.Zero; @@ -482,7 +474,6 @@ namespace OpenSim.Server.Handlers.Asset byte[] HandleDeleteItems(Dictionary request) { - Dictionary result = new Dictionary(); UUID principal = UUID.Zero; UUID.TryParse(request["PRINCIPAL"].ToString(), out principal); List slist = (List)request["ITEMS"]; diff --git a/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs index 3104917f83..85bf96e930 100644 --- a/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs @@ -129,8 +129,6 @@ namespace OpenSim.Server.Handlers.Presence byte[] LogoutAgent(Dictionary request) { UUID session = UUID.Zero; - Vector3 position = Vector3.Zero; - Vector3 lookat = Vector3.Zero; if (!request.ContainsKey("SessionID")) return FailureResult(); diff --git a/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs b/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs index 50d6fb207b..f33eda7f03 100644 --- a/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs +++ b/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs @@ -38,7 +38,7 @@ namespace OpenSim.Server.Handlers.Simulation public class SimulationServiceInConnector : ServiceConnector { private ISimulationService m_LocalSimulationService; - private IAuthenticationService m_AuthenticationService; +// private IAuthenticationService m_AuthenticationService; public SimulationServiceInConnector(IConfigSource config, IHttpServer server, IScene scene) : base(config, server, String.Empty)