aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2009-09-26 10:30:45 -0700
committerDiva Canto2009-09-26 10:30:45 -0700
commitb5163889b915c4405bdd266d32bcaf39aaf8079f (patch)
treeb32a591e8239a1cf9016e9009174ace03fef4a86
parentCorrected the port number to 8001 in the test client and grid ini. (diff)
downloadopensim-SC_OLD-b5163889b915c4405bdd266d32bcaf39aaf8079f.zip
opensim-SC_OLD-b5163889b915c4405bdd266d32bcaf39aaf8079f.tar.gz
opensim-SC_OLD-b5163889b915c4405bdd266d32bcaf39aaf8079f.tar.bz2
opensim-SC_OLD-b5163889b915c4405bdd266d32bcaf39aaf8079f.tar.xz
Fixed the order of params to GetRegionRange.
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs16
1 files changed, 10 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index bd12218..05ed70a 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -237,8 +237,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
237 237
238 List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, 238 List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
239 (int)(m_scene.RegionInfo.RegionLocX - 8) * (int)Constants.RegionSize, 239 (int)(m_scene.RegionInfo.RegionLocX - 8) * (int)Constants.RegionSize,
240 (int)(m_scene.RegionInfo.RegionLocY - 8) * (int)Constants.RegionSize,
241 (int)(m_scene.RegionInfo.RegionLocX + 8) * (int)Constants.RegionSize, 240 (int)(m_scene.RegionInfo.RegionLocX + 8) * (int)Constants.RegionSize,
241 (int)(m_scene.RegionInfo.RegionLocY - 8) * (int)Constants.RegionSize,
242 (int)(m_scene.RegionInfo.RegionLocY + 8) * (int)Constants.RegionSize); 242 (int)(m_scene.RegionInfo.RegionLocY + 8) * (int)Constants.RegionSize);
243 foreach (GridRegion r in regions) 243 foreach (GridRegion r in regions)
244 { 244 {
@@ -736,8 +736,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
736 // (diva note: why?? in that case we should GetRegionByPosition) 736 // (diva note: why?? in that case we should GetRegionByPosition)
737 // But make sure: Look whether the one we requested is in there 737 // But make sure: Look whether the one we requested is in there
738 List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, 738 List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
739 minX * (int)Constants.RegionSize, minY * (int)Constants.RegionSize, 739 minX * (int)Constants.RegionSize,
740 maxX * (int)Constants.RegionSize, maxY * (int)Constants.RegionSize); 740 maxX * (int)Constants.RegionSize,
741 minY * (int)Constants.RegionSize,
742 maxY * (int)Constants.RegionSize);
741 743
742 if (regions != null) 744 if (regions != null)
743 { 745 {
@@ -777,8 +779,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
777 { 779 {
778 List<MapBlockData> mapBlocks = new List<MapBlockData>(); 780 List<MapBlockData> mapBlocks = new List<MapBlockData>();
779 List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, 781 List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
780 (minX - 4) * (int)Constants.RegionSize, (minY - 4) * (int)Constants.RegionSize, 782 (minX - 4) * (int)Constants.RegionSize,
781 (maxX + 4) * (int)Constants.RegionSize, (maxY + 4) * (int)Constants.RegionSize); 783 (maxX + 4) * (int)Constants.RegionSize,
784 (minY - 4) * (int)Constants.RegionSize,
785 (maxY + 4) * (int)Constants.RegionSize);
782 foreach (GridRegion r in regions) 786 foreach (GridRegion r in regions)
783 { 787 {
784 MapBlockData block = new MapBlockData(); 788 MapBlockData block = new MapBlockData();
@@ -916,8 +920,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
916 List<MapBlockData> mapBlocks = new List<MapBlockData>(); 920 List<MapBlockData> mapBlocks = new List<MapBlockData>();
917 List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, 921 List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
918 (int)(m_scene.RegionInfo.RegionLocX - 9) * (int)Constants.RegionSize, 922 (int)(m_scene.RegionInfo.RegionLocX - 9) * (int)Constants.RegionSize,
919 (int)(m_scene.RegionInfo.RegionLocY - 9) * (int)Constants.RegionSize,
920 (int)(m_scene.RegionInfo.RegionLocX + 9) * (int)Constants.RegionSize, 923 (int)(m_scene.RegionInfo.RegionLocX + 9) * (int)Constants.RegionSize,
924 (int)(m_scene.RegionInfo.RegionLocY - 9) * (int)Constants.RegionSize,
921 (int)(m_scene.RegionInfo.RegionLocY + 9) * (int)Constants.RegionSize); 925 (int)(m_scene.RegionInfo.RegionLocY + 9) * (int)Constants.RegionSize);
922 List<AssetBase> textures = new List<AssetBase>(); 926 List<AssetBase> textures = new List<AssetBase>();
923 List<Image> bitImages = new List<Image>(); 927 List<Image> bitImages = new List<Image>();