diff options
Diffstat (limited to 'OpenSim/Services/Interfaces/IGridService.cs')
-rw-r--r-- | OpenSim/Services/Interfaces/IGridService.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs index 739e279..8e6279e 100644 --- a/OpenSim/Services/Interfaces/IGridService.cs +++ b/OpenSim/Services/Interfaces/IGridService.cs | |||
@@ -175,12 +175,12 @@ namespace OpenSim.Services.Interfaces | |||
175 | /// <summary> | 175 | /// <summary> |
176 | /// The co-ordinate of this region. | 176 | /// The co-ordinate of this region. |
177 | /// </summary> | 177 | /// </summary> |
178 | public int RegionCoordX { get { return RegionLocX / (int)Constants.RegionSize; } } | 178 | public int RegionCoordX { get { return (int)Util.WorldToRegionLoc((uint)RegionLocX); } } |
179 | 179 | ||
180 | /// <summary> | 180 | /// <summary> |
181 | /// The co-ordinate of this region | 181 | /// The co-ordinate of this region |
182 | /// </summary> | 182 | /// </summary> |
183 | public int RegionCoordY { get { return RegionLocY / (int)Constants.RegionSize; } } | 183 | public int RegionCoordY { get { return (int)Util.WorldToRegionLoc((uint)RegionLocY); } } |
184 | 184 | ||
185 | /// <summary> | 185 | /// <summary> |
186 | /// The location of this region in meters. | 186 | /// The location of this region in meters. |
@@ -259,8 +259,8 @@ namespace OpenSim.Services.Interfaces | |||
259 | 259 | ||
260 | public GridRegion(uint xcell, uint ycell) | 260 | public GridRegion(uint xcell, uint ycell) |
261 | { | 261 | { |
262 | m_regionLocX = (int)(xcell * Constants.RegionSize); | 262 | m_regionLocX = (int)Util.RegionToWorldLoc(xcell); |
263 | m_regionLocY = (int)(ycell * Constants.RegionSize); | 263 | m_regionLocY = (int)Util.RegionToWorldLoc(ycell); |
264 | RegionSizeX = (int)Constants.RegionSize; | 264 | RegionSizeX = (int)Constants.RegionSize; |
265 | RegionSizeY = (int)Constants.RegionSize; | 265 | RegionSizeY = (int)Constants.RegionSize; |
266 | } | 266 | } |
@@ -268,8 +268,8 @@ namespace OpenSim.Services.Interfaces | |||
268 | public GridRegion(RegionInfo ConvertFrom) | 268 | public GridRegion(RegionInfo ConvertFrom) |
269 | { | 269 | { |
270 | m_regionName = ConvertFrom.RegionName; | 270 | m_regionName = ConvertFrom.RegionName; |
271 | m_regionLocX = (int)(ConvertFrom.RegionLocX * Constants.RegionSize); | 271 | m_regionLocX = (int)(ConvertFrom.WorldLocX); |
272 | m_regionLocY = (int)(ConvertFrom.RegionLocY * Constants.RegionSize); | 272 | m_regionLocY = (int)(ConvertFrom.WorldLocY); |
273 | RegionSizeX = (int)ConvertFrom.RegionSizeX; | 273 | RegionSizeX = (int)ConvertFrom.RegionSizeX; |
274 | RegionSizeY = (int)ConvertFrom.RegionSizeY; | 274 | RegionSizeY = (int)ConvertFrom.RegionSizeY; |
275 | m_internalEndPoint = ConvertFrom.InternalEndPoint; | 275 | m_internalEndPoint = ConvertFrom.InternalEndPoint; |