diff options
author | Diva Canto | 2011-06-12 17:05:45 -0700 |
---|---|---|
committer | Diva Canto | 2011-06-12 17:05:45 -0700 |
commit | 78c16da5444a2e363de50bc88c8d2b929dec0989 (patch) | |
tree | 9dc676c9e12db4538813327b77e4abbdf9a96d13 /OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |
parent | First pass at making the V2 map work. Standalones only for now. There are som... (diff) | |
download | opensim-SC_OLD-78c16da5444a2e363de50bc88c8d2b929dec0989.zip opensim-SC_OLD-78c16da5444a2e363de50bc88c8d2b929dec0989.tar.gz opensim-SC_OLD-78c16da5444a2e363de50bc88c8d2b929dec0989.tar.bz2 opensim-SC_OLD-78c16da5444a2e363de50bc88c8d2b929dec0989.tar.xz |
A few bug fixes on map V2. Zoom level weirdness still there.
Diffstat (limited to 'OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index 079b1c2..6e142bb 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -836,7 +836,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
836 | block.Access = 254; // means 'simulator is offline' | 836 | block.Access = 254; // means 'simulator is offline' |
837 | response.Add(block); | 837 | response.Add(block); |
838 | } | 838 | } |
839 | remoteClient.SendMapBlock(response, 0); | 839 | if ((flag & 2) == 2) // V2 !!! |
840 | remoteClient.SendMapBlock(response, 2); | ||
841 | else | ||
842 | remoteClient.SendMapBlock(response, 0); | ||
840 | } | 843 | } |
841 | else | 844 | else |
842 | { | 845 | { |
@@ -849,17 +852,20 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
849 | { | 852 | { |
850 | List<MapBlockData> mapBlocks = new List<MapBlockData>(); | 853 | List<MapBlockData> mapBlocks = new List<MapBlockData>(); |
851 | List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, | 854 | List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, |
852 | (minX - 8) * (int)Constants.RegionSize, | 855 | (minX - 4) * (int)Constants.RegionSize, |
853 | (maxX + 8) * (int)Constants.RegionSize, | 856 | (maxX + 4) * (int)Constants.RegionSize, |
854 | (minY - 8) * (int)Constants.RegionSize, | 857 | (minY - 4) * (int)Constants.RegionSize, |
855 | (maxY + 8) * (int)Constants.RegionSize); | 858 | (maxY + 4) * (int)Constants.RegionSize); |
856 | foreach (GridRegion r in regions) | 859 | foreach (GridRegion r in regions) |
857 | { | 860 | { |
858 | MapBlockData block = new MapBlockData(); | 861 | MapBlockData block = new MapBlockData(); |
859 | MapBlockFromGridRegion(block, r); | 862 | MapBlockFromGridRegion(block, r); |
860 | mapBlocks.Add(block); | 863 | mapBlocks.Add(block); |
861 | } | 864 | } |
862 | remoteClient.SendMapBlock(mapBlocks, 0); | 865 | if ((flag & 2) == 2) // V2 !!! |
866 | remoteClient.SendMapBlock(mapBlocks, 2); | ||
867 | else | ||
868 | remoteClient.SendMapBlock(mapBlocks, 0); | ||
863 | 869 | ||
864 | return mapBlocks; | 870 | return mapBlocks; |
865 | } | 871 | } |