Remove mono compiler warnings. Fix problem with co-ordinate given in deregister region message
parent
06ed824711
commit
25133cbdf6
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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) :
|
||||
|
|
Loading…
Reference in New Issue