diff options
-rw-r--r-- | OpenSim/Data/IRegionData.cs | 10 | ||||
-rw-r--r-- | OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs | 2 | ||||
-rw-r--r-- | 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 | |||
47 | /// The position in meters of this region. | 47 | /// The position in meters of this region. |
48 | /// </summary> | 48 | /// </summary> |
49 | public int posY; | 49 | public int posY; |
50 | 50 | ||
51 | public int sizeX; | 51 | public int sizeX; |
52 | public int sizeY; | 52 | public int sizeY; |
53 | 53 | ||
54 | /// <summary> | 54 | /// <summary> |
55 | /// Return the x-coordinate of this region. We currently assume that every region is the same size. | 55 | /// Return the x-coordinate of this region. |
56 | /// </summary> | 56 | /// </summary> |
57 | public int coordX { get { return (sizeX != 0) ? posX / sizeX : -1; } } | 57 | public int coordX { get { return (sizeX != 0) ? posX / (int)Constants.RegionSize : -1; } } |
58 | 58 | ||
59 | /// <summary> | 59 | /// <summary> |
60 | /// Return the y-coordinate of this region. We currently assume that every region is the same size. | 60 | /// Return the y-coordinate of this region. |
61 | /// </summary> | 61 | /// </summary> |
62 | public int coordY { get { return (sizeY != 0) ? posY / sizeY : -1; } } | 62 | public int coordY { get { return (sizeY != 0) ? posY / (int)Constants.RegionSize : -1; } } |
63 | 63 | ||
64 | public Dictionary<string, object> Data; | 64 | public Dictionary<string, object> Data; |
65 | } | 65 | } |
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 | |||
99 | } | 99 | } |
100 | 100 | ||
101 | return FailureResult(); | 101 | return FailureResult(); |
102 | |||
103 | } | 102 | } |
104 | 103 | ||
105 | #region Method-specific handlers | 104 | #region Method-specific handlers |
@@ -127,7 +126,6 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
127 | return FailureResult(); | 126 | return FailureResult(); |
128 | } | 127 | } |
129 | 128 | ||
130 | string perms = "0"; | ||
131 | FriendInfo[] friendsInfo = m_FriendsService.GetFriends(principalID); | 129 | FriendInfo[] friendsInfo = m_FriendsService.GetFriends(principalID); |
132 | foreach (FriendInfo finfo in friendsInfo) | 130 | foreach (FriendInfo finfo in friendsInfo) |
133 | { | 131 | { |
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 | |||
42 | { | 42 | { |
43 | public class MapGetServiceConnector : ServiceConnector | 43 | public class MapGetServiceConnector : ServiceConnector |
44 | { | 44 | { |
45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 45 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
46 | |||
46 | private IMapImageService m_MapService; | 47 | private IMapImageService m_MapService; |
47 | 48 | ||
48 | private string m_ConfigName = "MapImageService"; | 49 | private string m_ConfigName = "MapImageService"; |
@@ -69,7 +70,8 @@ namespace OpenSim.Server.Handlers.MapImage | |||
69 | 70 | ||
70 | class MapServerGetHandler : BaseStreamHandler | 71 | class MapServerGetHandler : BaseStreamHandler |
71 | { | 72 | { |
72 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 73 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
74 | |||
73 | private IMapImageService m_MapService; | 75 | private IMapImageService m_MapService; |
74 | 76 | ||
75 | public MapServerGetHandler(IMapImageService service) : | 77 | public MapServerGetHandler(IMapImageService service) : |