From dcfd343a1e9dacb800e1272f38eefad3c5d9bf53 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Mon, 17 Nov 2008 16:22:21 +0000 Subject: minor: remove mono compiler warnings --- OpenSim/Grid/MessagingServer/MessageService.cs | 6 ++-- .../Avatar/InstantMessage/InstantMessageModule.cs | 2 +- .../Avatar/InstantMessage/MessageTransferModule.cs | 34 +++++++++++----------- 3 files changed, 21 insertions(+), 21 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Grid/MessagingServer/MessageService.cs b/OpenSim/Grid/MessagingServer/MessageService.cs index 77da306..b4a0c21 100644 --- a/OpenSim/Grid/MessagingServer/MessageService.cs +++ b/OpenSim/Grid/MessagingServer/MessageService.cs @@ -547,7 +547,7 @@ namespace OpenSim.Grid.MessagingServer else m_log.InfoFormat("[SERVER] Registered with {0}", srv); } - catch (Exception ex) + catch { m_log.ErrorFormat("Unable to connect to server {0}. Server not running?", srv); success = false; @@ -593,9 +593,9 @@ namespace OpenSim.Grid.MessagingServer if(!UserRespData.ContainsKey("responsestring")) success = false; } - catch (Exception ex) + catch { - m_log.Error("Unable to connect to grid. User server not running?"); + m_log.ErrorFormat("Unable to connect to server {0}. Server not running?", srv); success = false; } } diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs index b106435..88c0680 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs @@ -50,7 +50,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage #region IRegionModule Members - private bool gridmode = false; + //private bool gridmode = false; private IMessageTransferModule m_TransferModule = null; diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs index 8c9abc1..c5b5ebb 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs @@ -565,23 +565,23 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage /// /// UUID of region to get the region handle for /// - private ulong getLocalRegionHandleFromUUID(UUID regionID) - { - ulong returnhandle = 0; - - lock (m_Scenes) - { - foreach (Scene sn in m_Scenes) - { - if (sn.RegionInfo.RegionID == regionID) - { - returnhandle = sn.RegionInfo.RegionHandle; - break; - } - } - } - return returnhandle; - } +// private ulong getLocalRegionHandleFromUUID(UUID regionID) +// { +// ulong returnhandle = 0; +// +// lock (m_Scenes) +// { +// foreach (Scene sn in m_Scenes) +// { +// if (sn.RegionInfo.RegionID == regionID) +// { +// returnhandle = sn.RegionInfo.RegionHandle; +// break; +// } +// } +// } +// return returnhandle; +// } /// /// Takes a GridInstantMessage and converts it into a Hashtable for XMLRPC -- cgit v1.1