From b89534ad0a8a0be24f27634b9a198e2b53f129e0 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 19 Nov 2011 00:34:13 +0000
Subject: Remove mono compiler warnings.  Fix problem with co-ordinate given in
 deregister region message

---
 OpenSim/Data/IRegionData.cs                                    | 10 +++++-----
 .../Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs    |  2 --
 OpenSim/Server/Handlers/Map/MapGetServerConnector.cs           |  6 ++++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/OpenSim/Data/IRegionData.cs b/OpenSim/Data/IRegionData.cs
index 4761a7a..0068daa 100644
--- a/OpenSim/Data/IRegionData.cs
+++ b/OpenSim/Data/IRegionData.cs
@@ -47,19 +47,19 @@ namespace OpenSim.Data
         /// The position in meters of this region.
         /// </summary>
         public int posY;
-        
+
         public int sizeX;
         public int sizeY;
 
         /// <summary>
-        /// Return the x-coordinate of this region.  We currently assume that every region is the same size.
+        /// Return the x-coordinate of this region.
         /// </summary>
-        public int coordX { get { return (sizeX != 0) ? posX / sizeX : -1; } }
+        public int coordX { get { return (sizeX != 0) ? posX / (int)Constants.RegionSize : -1; } }
 
         /// <summary>
-        /// Return the y-coordinate of this region.  We currently assume that every region is the same size.
+        /// Return the y-coordinate of this region.
         /// </summary>
-        public int coordY { get { return (sizeY != 0) ? posY / sizeY : -1; } }
+        public int coordY { get { return (sizeY != 0) ? posY / (int)Constants.RegionSize : -1; } }
 
         public Dictionary<string, object> Data;
     }
diff --git a/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs b/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs
index 5c89d0f..56f130e 100644
--- a/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs
@@ -99,7 +99,6 @@ namespace OpenSim.Server.Handlers.Hypergrid
             }
 
             return FailureResult();
-
         }
 
         #region Method-specific handlers
@@ -127,7 +126,6 @@ namespace OpenSim.Server.Handlers.Hypergrid
                 return FailureResult();
             }
 
-            string perms = "0";
             FriendInfo[] friendsInfo = m_FriendsService.GetFriends(principalID);
             foreach (FriendInfo finfo in friendsInfo)
             {
diff --git a/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs b/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs
index e8a424f..501074d 100644
--- a/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs
+++ b/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs
@@ -42,7 +42,8 @@ namespace OpenSim.Server.Handlers.MapImage
 {
     public class MapGetServiceConnector : ServiceConnector
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         private IMapImageService m_MapService;
 
         private string m_ConfigName = "MapImageService";
@@ -69,7 +70,8 @@ namespace OpenSim.Server.Handlers.MapImage
 
     class MapServerGetHandler : BaseStreamHandler
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         private IMapImageService m_MapService;
 
         public MapServerGetHandler(IMapImageService service) :
-- 
cgit v1.1