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

Changed position methods so that they assume the input params are in meters.

remotes/origin/0.6.7-post-fixes
Diva Canto 2009-09-21 17:16:30 -07:00
parent b6b8a18d37
commit ae07b220c6
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Services/GridService/GridService.cs
View File

@ -95,7 +95,9 @@ namespace OpenSim.Services.GridService
if (region != null) if (region != null)
{ {
// Not really? Maybe? // Not really? Maybe?
List<RegionData> rdatas = m_Database.Get(region.posX - 1, region.posY - 1, region.posX + 1, region.posY + 1, scopeID); List<RegionData> rdatas = m_Database.Get(region.posX - (int)Constants.RegionSize, region.posY - (int)Constants.RegionSize,
region.posX + (int)Constants.RegionSize, region.posY + (int)Constants.RegionSize, scopeID);
foreach (RegionData rdata in rdatas) foreach (RegionData rdata in rdatas)
rinfos.Add(RegionData2RegionInfo(rdata)); rinfos.Add(RegionData2RegionInfo(rdata));
@ -114,7 +116,9 @@ namespace OpenSim.Services.GridService
public SimpleRegionInfo GetRegionByPosition(UUID scopeID, int x, int y) public SimpleRegionInfo GetRegionByPosition(UUID scopeID, int x, int y)
{ {
RegionData rdata = m_Database.Get(x, y, scopeID); int snapX = (int)(x / Constants.RegionSize) * (int)Constants.RegionSize;
int snapY = (int)(y / Constants.RegionSize) * (int)Constants.RegionSize;
RegionData rdata = m_Database.Get(snapX, snapY, scopeID);
if (rdata != null) if (rdata != null)
return RegionData2RegionInfo(rdata); return RegionData2RegionInfo(rdata);
@ -151,7 +155,12 @@ namespace OpenSim.Services.GridService
public List<SimpleRegionInfo> GetRegionRange(UUID scopeID, int xmin, int xmax, int ymin, int ymax) public List<SimpleRegionInfo> GetRegionRange(UUID scopeID, int xmin, int xmax, int ymin, int ymax)
{ {
List<RegionData> rdatas = m_Database.Get(xmin, ymin, xmax, ymax, scopeID); int xminSnap = (int)(xmin / Constants.RegionSize) * (int)Constants.RegionSize;
int xmaxSnap = (int)(xmax / Constants.RegionSize) * (int)Constants.RegionSize;
int yminSnap = (int)(ymin / Constants.RegionSize) * (int)Constants.RegionSize;
int ymaxSnap = (int)(ymax / Constants.RegionSize) * (int)Constants.RegionSize;
List<RegionData> rdatas = m_Database.Get(xminSnap, yminSnap, xmaxSnap, ymaxSnap, scopeID);
List<SimpleRegionInfo> rinfos = new List<SimpleRegionInfo>(); List<SimpleRegionInfo> rinfos = new List<SimpleRegionInfo>();
foreach (RegionData rdata in rdatas) foreach (RegionData rdata in rdatas)
rinfos.Add(RegionData2RegionInfo(rdata)); rinfos.Add(RegionData2RegionInfo(rdata));