From fbf90b1ecec7bf26bb0e948f34877bb049e6f333 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Tue, 25 Nov 2008 15:41:42 +0000 Subject: * minor: eliminate mono compiler warnings --- OpenSim/Framework/Communications/LoginService.cs | 2 +- OpenSim/Region/Communications/Hypergrid/HGGridServices.cs | 6 +++--- OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs | 4 ++-- OpenSim/Region/Communications/Hypergrid/HGUserServices.cs | 6 +++--- .../Environment/Modules/Hypergrid/HGStandaloneAssetService.cs | 5 +++-- .../Environment/Modules/Hypergrid/HGStandaloneInventoryService.cs | 5 +++-- OpenSim/Region/Environment/Scenes/Hypergrid/HGAssetMapper.cs | 2 +- 7 files changed, 16 insertions(+), 14 deletions(-) diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs index 8199598..c3dcc90 100644 --- a/OpenSim/Framework/Communications/LoginService.cs +++ b/OpenSim/Framework/Communications/LoginService.cs @@ -118,7 +118,7 @@ namespace OpenSim.Framework.Communications bool GoodXML = (requestData.Contains("first") && requestData.Contains("last") && (requestData.Contains("passwd") || requestData.Contains("web_login_key"))); - bool GoodLogin; + //bool GoodLogin; string startLocationRequest = "last"; diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs index 5433e41..d05a1d1 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs @@ -527,10 +527,10 @@ namespace OpenSim.Region.Communications.Hypergrid public bool InformRegionOfUser(RegionInfo regInfo, AgentCircuitData agentData) { - ulong regionHandle = regInfo.RegionHandle; + //ulong regionHandle = regInfo.RegionHandle; try { - regionHandle = Convert.ToUInt64(regInfo.regionSecret); + //regionHandle = Convert.ToUInt64(regInfo.regionSecret); m_log.Info("[HGrid]: InformRegionOfUser: Remote hyperlinked region " + regInfo.regionSecret); } catch @@ -883,7 +883,7 @@ namespace OpenSim.Region.Communications.Hypergrid if (regInfo == null) return false; - ulong realHandle = regionHandle; + //ulong realHandle = regionHandle; CachedUserInfo uinfo = m_userProfileCache.GetUserDetails(agentData.AgentID); if ((uinfo == null) || !IsGoingHome(uinfo, regInfo)) diff --git a/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs b/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs index 9ef040b..136fea1 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs @@ -46,7 +46,7 @@ namespace OpenSim.Region.Communications.Hypergrid = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private string _inventoryServerUrl; - private Uri m_Uri; + //private Uri m_Uri; private UserProfileCacheService m_userProfileCache; private bool m_gridmode = false; @@ -61,7 +61,7 @@ namespace OpenSim.Region.Communications.Hypergrid public HGInventoryService(string inventoryServerUrl, UserProfileCacheService userProfileCacheService, bool gridmode) { _inventoryServerUrl = HGNetworkServersInfo.ServerURI(inventoryServerUrl); - m_Uri = new Uri(_inventoryServerUrl); + //m_Uri = new Uri(_inventoryServerUrl); m_userProfileCache = userProfileCacheService; m_gridmode = gridmode; } diff --git a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs index d9b44a1..0ac39e9 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs @@ -47,14 +47,14 @@ namespace OpenSim.Region.Communications.Hypergrid /// public class HGUserServices : IUserService, IAvatarService, IMessagingService { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - private HGCommunicationsGridMode m_parent; + //private HGCommunicationsGridMode m_parent; private OGS1UserServices m_remoteUserServices; public HGUserServices(HGCommunicationsGridMode parent) { - m_parent = parent; + //m_parent = parent; m_remoteUserServices = new OGS1UserServices(parent); } diff --git a/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneAssetService.cs b/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneAssetService.cs index cfcda42..192904c 100644 --- a/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneAssetService.cs +++ b/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneAssetService.cs @@ -53,7 +53,7 @@ namespace OpenSim.Region.Environment.Modules.Hypergrid private static bool enabled = false; Scene m_scene; - AssetService m_assetService; + //AssetService m_assetService; #region IRegionModule interface @@ -75,7 +75,8 @@ namespace OpenSim.Region.Environment.Modules.Hypergrid { m_log.Info("[HGStandaloneAssetService]: Starting..."); - m_assetService = new AssetService(m_scene); + //m_assetService = new AssetService(m_scene); + new AssetService(m_scene); } } diff --git a/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneInventoryService.cs b/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneInventoryService.cs index 7203b88..7eeece9 100644 --- a/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneInventoryService.cs +++ b/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneInventoryService.cs @@ -52,7 +52,7 @@ namespace OpenSim.Region.Environment.Modules.Hypergrid private static bool enabled = false; Scene m_scene; - InventoryService m_inventoryService; + //InventoryService m_inventoryService; #region IRegionModule interface @@ -73,7 +73,8 @@ namespace OpenSim.Region.Environment.Modules.Hypergrid if (enabled) { m_log.Info("[HGStandaloneInvService]: Starting..."); - m_inventoryService = new InventoryService(m_scene); + //m_inventoryService = new InventoryService(m_scene); + new InventoryService(m_scene); } } diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGAssetMapper.cs b/OpenSim/Region/Environment/Scenes/Hypergrid/HGAssetMapper.cs index 3e27b7c..1715ffe 100644 --- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGAssetMapper.cs +++ b/OpenSim/Region/Environment/Scenes/Hypergrid/HGAssetMapper.cs @@ -262,7 +262,7 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid private Dictionary SniffUUIDs(UUID assetID) { - Dictionary uuids = new Dictionary(); + //Dictionary uuids = new Dictionary(); AssetBase asset; m_scene.CommsManager.AssetCache.TryGetCachedAsset(assetID, out asset); -- cgit v1.1