From cf1cf738399e659b24d3a4ece2dd091ac8d041fb Mon Sep 17 00:00:00 2001 From: MW Date: Wed, 25 Jun 2008 20:14:47 +0000 Subject: added the flag param to IClientAPI.SendMapBlock --- OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs | 2 +- OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs | 6 +++--- OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'OpenSim/Region/Environment') 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 { } - public virtual void SendMapBlock(List mapBlocks) + public virtual void SendMapBlock(List mapBlocks, uint flag) { } 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 List mapBlocks; mapBlocks = cachedMapBlocks; - avatarPresence.ControllingClient.SendMapBlock(mapBlocks); + avatarPresence.ControllingClient.SendMapBlock(mapBlocks, 0); } else { @@ -167,7 +167,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap List mapBlocks; 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); - avatarPresence.ControllingClient.SendMapBlock(mapBlocks); + avatarPresence.ControllingClient.SendMapBlock(mapBlocks,0); lock (cachedMapBlocks) cachedMapBlocks = mapBlocks; @@ -245,7 +245,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap { List mapBlocks; mapBlocks = m_scene.SceneGridService.RequestNeighbourMapBlocks(minX - 4, minY - 4, minX + 4, minY + 4); - remoteClient.SendMapBlock(mapBlocks); + remoteClient.SendMapBlock(mapBlocks, flag); } 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 { List mapBlocks; mapBlocks = m_commsProvider.GridService.RequestNeighbourMapBlocks(minX - 4, minY - 4, minX + 4, minY + 4); - remoteClient.SendMapBlock(mapBlocks); + remoteClient.SendMapBlock(mapBlocks, 0); } /// -- cgit v1.1