OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove mono compiler warnings. Fix problem with co-ordinate given in deregister region message

0.7.2-post-fixes
Justin Clark-Casey (justincc) 2011-11-19 00:34:13 +00:00
parent 06ed824711
commit 25133cbdf6
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Data/IRegionData.cs
View File

@ -47,19 +47,19 @@ namespace OpenSim.Data
/// The position in meters of this region. /// The position in meters of this region.
/// </summary> /// </summary>
public int posY; public int posY;
public int sizeX; public int sizeX;
public int sizeY; public int sizeY;
/// <summary> /// <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> /// </summary>
public int coordX { get { return (sizeX != 0) ? posX / sizeX : -1; } } public int coordX { get { return (sizeX != 0) ? posX / (int)Constants.RegionSize : -1; } }
/// <summary> /// <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> /// </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; public Dictionary<string, object> Data;
} }

2
OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs
View File

@ -99,7 +99,6 @@ namespace OpenSim.Server.Handlers.Hypergrid
} }
return FailureResult(); return FailureResult();
} }
#region Method-specific handlers #region Method-specific handlers
@ -127,7 +126,6 @@ namespace OpenSim.Server.Handlers.Hypergrid
return FailureResult(); return FailureResult();
} }
string perms = "0";
FriendInfo[] friendsInfo = m_FriendsService.GetFriends(principalID); FriendInfo[] friendsInfo = m_FriendsService.GetFriends(principalID);
foreach (FriendInfo finfo in friendsInfo) foreach (FriendInfo finfo in friendsInfo)
{ {

6
OpenSim/Server/Handlers/Map/MapGetServerConnector.cs
View File

@ -42,7 +42,8 @@ namespace OpenSim.Server.Handlers.MapImage
{ {
public class MapGetServiceConnector : ServiceConnector 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 IMapImageService m_MapService;
private string m_ConfigName = "MapImageService"; private string m_ConfigName = "MapImageService";
@ -69,7 +70,8 @@ namespace OpenSim.Server.Handlers.MapImage
class MapServerGetHandler : BaseStreamHandler 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; private IMapImageService m_MapService;
public MapServerGetHandler(IMapImageService service) : public MapServerGetHandler(IMapImageService service) :