aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2012-01-30 20:11:47 +0000
committerMelanie2012-01-30 20:11:47 +0000
commitbde2ff5e78360061be89e4c5717f4d67248d9185 (patch)
tree0552dfb8f04cc1208d8bae9b31d2efebb1b5d946 /OpenSim/Region
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-bde2ff5e78360061be89e4c5717f4d67248d9185.zip
opensim-SC_OLD-bde2ff5e78360061be89e4c5717f4d67248d9185.tar.gz
opensim-SC_OLD-bde2ff5e78360061be89e4c5717f4d67248d9185.tar.bz2
opensim-SC_OLD-bde2ff5e78360061be89e4c5717f4d67248d9185.tar.xz
Next step for world map overlays
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 103d128..c81eeeb 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -263,7 +263,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
263 foreach (GridRegion r in regions) 263 foreach (GridRegion r in regions)
264 { 264 {
265 MapBlockData block = new MapBlockData(); 265 MapBlockData block = new MapBlockData();
266 MapBlockFromGridRegion(block, r); 266 MapBlockFromGridRegion(block, r, 0);
267 mapBlocks.Add(block); 267 mapBlocks.Add(block);
268 } 268 }
269 avatarPresence.ControllingClient.SendMapBlock(mapBlocks, 0); 269 avatarPresence.ControllingClient.SendMapBlock(mapBlocks, 0);
@@ -990,7 +990,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
990 response.Add(block); 990 response.Add(block);
991 } 991 }
992 // The lower 16 bits are an unsigned int16 992 // The lower 16 bits are an unsigned int16
993 remoteClient.SendMapBlock(response, flags & 0xffff); 993 remoteClient.SendMapBlock(response, flag & 0xffff);
994 } 994 }
995 else 995 else
996 { 996 {
@@ -1031,6 +1031,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
1031 break; 1031 break;
1032 default: 1032 default:
1033 block.MapImageId = UUID.Zero; 1033 block.MapImageId = UUID.Zero;
1034 break;
1034 } 1035 }
1035 block.Name = r.RegionName; 1036 block.Name = r.RegionName;
1036 block.X = (ushort)(r.RegionLocX / Constants.RegionSize); 1037 block.X = (ushort)(r.RegionLocX / Constants.RegionSize);