aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorMW2008-06-25 20:14:47 +0000
committerMW2008-06-25 20:14:47 +0000
commitcf1cf738399e659b24d3a4ece2dd091ac8d041fb (patch)
treef92a97cc7babb1aa47651e9e15ceb7ef5e645aba /OpenSim/Region/Environment
parentfirst part of Requestmapblocks fixes: Adds uint flags param to the OnRequestM... (diff)
downloadopensim-SC_OLD-cf1cf738399e659b24d3a4ece2dd091ac8d041fb.zip
opensim-SC_OLD-cf1cf738399e659b24d3a4ece2dd091ac8d041fb.tar.gz
opensim-SC_OLD-cf1cf738399e659b24d3a4ece2dd091ac8d041fb.tar.bz2
opensim-SC_OLD-cf1cf738399e659b24d3a4ece2dd091ac8d041fb.tar.xz
added the flag param to IClientAPI.SendMapBlock
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs2
3 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
index 50403b9..f4d2848 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
@@ -452,7 +452,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
452 { 452 {
453 } 453 }
454 454
455 public virtual void SendMapBlock(List<MapBlockData> mapBlocks) 455 public virtual void SendMapBlock(List<MapBlockData> mapBlocks, uint flag)
456 { 456 {
457 } 457 }
458 458
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs
index dda9c1c..2a7af87 100644
--- a/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs
@@ -155,7 +155,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
155 List<MapBlockData> mapBlocks; 155 List<MapBlockData> mapBlocks;
156 156
157 mapBlocks = cachedMapBlocks; 157 mapBlocks = cachedMapBlocks;
158 avatarPresence.ControllingClient.SendMapBlock(mapBlocks); 158 avatarPresence.ControllingClient.SendMapBlock(mapBlocks, 0);
159 } 159 }
160 else 160 else
161 { 161 {
@@ -167,7 +167,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
167 List<MapBlockData> mapBlocks; 167 List<MapBlockData> mapBlocks;
168 168
169 mapBlocks = m_scene.SceneGridService.RequestNeighbourMapBlocks((int)m_scene.RegionInfo.RegionLocX - 8, (int)m_scene.RegionInfo.RegionLocY - 8, (int)m_scene.RegionInfo.RegionLocX + 8, (int)m_scene.RegionInfo.RegionLocY + 8); 169 mapBlocks = m_scene.SceneGridService.RequestNeighbourMapBlocks((int)m_scene.RegionInfo.RegionLocX - 8, (int)m_scene.RegionInfo.RegionLocY - 8, (int)m_scene.RegionInfo.RegionLocX + 8, (int)m_scene.RegionInfo.RegionLocY + 8);
170 avatarPresence.ControllingClient.SendMapBlock(mapBlocks); 170 avatarPresence.ControllingClient.SendMapBlock(mapBlocks,0);
171 171
172 lock (cachedMapBlocks) 172 lock (cachedMapBlocks)
173 cachedMapBlocks = mapBlocks; 173 cachedMapBlocks = mapBlocks;
@@ -245,7 +245,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
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, flag);
249 } 249 }
250 250
251 public Hashtable OnHTTPGetMapImage(Hashtable keysvals) 251 public Hashtable OnHTTPGetMapImage(Hashtable keysvals)
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index e841ad4..6e14577 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -542,7 +542,7 @@ namespace OpenSim.Region.Environment.Scenes
542 { 542 {
543 List<MapBlockData> mapBlocks; 543 List<MapBlockData> mapBlocks;
544 mapBlocks = m_commsProvider.GridService.RequestNeighbourMapBlocks(minX - 4, minY - 4, minX + 4, minY + 4); 544 mapBlocks = m_commsProvider.GridService.RequestNeighbourMapBlocks(minX - 4, minY - 4, minX + 4, minY + 4);
545 remoteClient.SendMapBlock(mapBlocks); 545 remoteClient.SendMapBlock(mapBlocks, 0);
546 } 546 }
547 547
548 /// <summary> 548 /// <summary>