diff options
Diffstat (limited to 'OpenSim/Services/GridService/GridService.cs')
-rw-r--r-- | OpenSim/Services/GridService/GridService.cs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs index 137ce04..8198592 100644 --- a/OpenSim/Services/GridService/GridService.cs +++ b/OpenSim/Services/GridService/GridService.cs | |||
@@ -313,6 +313,7 @@ namespace OpenSim.Services.GridService | |||
313 | if (region != null) | 313 | if (region != null) |
314 | { | 314 | { |
315 | // Not really? Maybe? | 315 | // Not really? Maybe? |
316 | // The adjacent regions are presumed to be the same size as the current region | ||
316 | List<RegionData> rdatas = m_Database.Get( | 317 | List<RegionData> rdatas = m_Database.Get( |
317 | region.posX - region.sizeX - 1, region.posY - region.sizeY - 1, | 318 | region.posX - region.sizeX - 1, region.posY - region.sizeY - 1, |
318 | region.posX + region.sizeX + 1, region.posY + region.sizeY + 1, scopeID); | 319 | region.posX + region.sizeX + 1, region.posY + region.sizeY + 1, scopeID); |
@@ -643,20 +644,20 @@ namespace OpenSim.Services.GridService | |||
643 | return; | 644 | return; |
644 | } | 645 | } |
645 | 646 | ||
646 | int x, y; | 647 | uint x, y; |
647 | if (!int.TryParse(cmd[3], out x)) | 648 | if (!uint.TryParse(cmd[3], out x)) |
648 | { | 649 | { |
649 | MainConsole.Instance.Output("x-coord must be an integer"); | 650 | MainConsole.Instance.Output("x-coord must be an integer"); |
650 | return; | 651 | return; |
651 | } | 652 | } |
652 | 653 | ||
653 | if (!int.TryParse(cmd[4], out y)) | 654 | if (!uint.TryParse(cmd[4], out y)) |
654 | { | 655 | { |
655 | MainConsole.Instance.Output("y-coord must be an integer"); | 656 | MainConsole.Instance.Output("y-coord must be an integer"); |
656 | return; | 657 | return; |
657 | } | 658 | } |
658 | 659 | ||
659 | RegionData region = m_Database.Get(x * (int)Constants.RegionSize, y * (int)Constants.RegionSize, UUID.Zero); | 660 | RegionData region = m_Database.Get((int)Util.RegionToWorldLoc(x), (int)Util.RegionToWorldLoc(y), UUID.Zero); |
660 | if (region == null) | 661 | if (region == null) |
661 | { | 662 | { |
662 | MainConsole.Instance.OutputFormat("No region found at {0},{1}", x, y); | 663 | MainConsole.Instance.OutputFormat("No region found at {0},{1}", x, y); |