aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/IClientAPI.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs3
3 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 10f8276..9bb326c 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -421,7 +421,7 @@ namespace OpenSim.Framework
421 421
422 public delegate void DelinkObjects(List<uint> primIds); 422 public delegate void DelinkObjects(List<uint> primIds);
423 423
424 public delegate void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY); 424 public delegate void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag);
425 425
426 public delegate void RequestMapName(IClientAPI remoteClient, string mapName); 426 public delegate void RequestMapName(IClientAPI remoteClient, string mapName);
427 427
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index facee5c..bf435ed 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -5420,7 +5420,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5420 if (handlerRequestMapBlocks != null) 5420 if (handlerRequestMapBlocks != null)
5421 { 5421 {
5422 handlerRequestMapBlocks(this, MapRequest.PositionData.MinX, MapRequest.PositionData.MinY, 5422 handlerRequestMapBlocks(this, MapRequest.PositionData.MinX, MapRequest.PositionData.MinY,
5423 MapRequest.PositionData.MaxX, MapRequest.PositionData.MaxY); 5423 MapRequest.PositionData.MaxX, MapRequest.PositionData.MaxY, MapRequest.AgentData.Flags);
5424 } 5424 }
5425 break; 5425 break;
5426 case PacketType.MapNameRequest: 5426 case PacketType.MapNameRequest:
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs
index 5287517..dda9c1c 100644
--- a/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs
@@ -241,12 +241,13 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
241 /// <param name="minY"></param> 241 /// <param name="minY"></param>
242 /// <param name="maxX"></param> 242 /// <param name="maxX"></param>
243 /// <param name="maxY"></param> 243 /// <param name="maxY"></param>
244 public virtual void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY) 244 public virtual void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag)
245 { 245 {
246 List<MapBlockData> mapBlocks; 246 List<MapBlockData> mapBlocks;
247 mapBlocks = m_scene.SceneGridService.RequestNeighbourMapBlocks(minX - 4, minY - 4, minX + 4, minY + 4); 247 mapBlocks = m_scene.SceneGridService.RequestNeighbourMapBlocks(minX - 4, minY - 4, minX + 4, minY + 4);
248 remoteClient.SendMapBlock(mapBlocks); 248 remoteClient.SendMapBlock(mapBlocks);
249 } 249 }
250
250 public Hashtable OnHTTPGetMapImage(Hashtable keysvals) 251 public Hashtable OnHTTPGetMapImage(Hashtable keysvals)
251 { 252 {
252 m_log.Info("[WEBMAP]: Sending map image jpeg"); 253 m_log.Info("[WEBMAP]: Sending map image jpeg");