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/Framework/IClientAPI.cs | 2 +- OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 8 ++++---- OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs | 2 +- .../Region/Environment/Modules/World/WorldMap/WorldMapModule.cs | 6 +++--- OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | 2 +- OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 9bb326c..fa2ab0b 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs @@ -869,7 +869,7 @@ namespace OpenSim.Framework void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint, string capsURL); - void SendMapBlock(List mapBlocks); + void SendMapBlock(List mapBlocks, uint flag); void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags); void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index bf435ed..eb2a482 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs @@ -1211,7 +1211,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP OutPacket(newSimPack, ThrottleOutPacketType.Unknown); } - internal void SendMapBlockSplit(List mapBlocks) + internal void SendMapBlockSplit(List mapBlocks, uint flag) { MapBlockReplyPacket mapReply = (MapBlockReplyPacket)PacketPool.Instance.GetPacket(PacketType.MapBlockReply); // TODO: don't create new blocks if recycling an old packet @@ -1220,7 +1220,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP mapReply.AgentData.AgentID = AgentId; mapReply.Data = new MapBlockReplyPacket.DataBlock[mapBlocks2.Length]; - mapReply.AgentData.Flags = 0; + mapReply.AgentData.Flags = flag; for (int i = 0; i < mapBlocks2.Length; i++) { @@ -1238,7 +1238,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP OutPacket(mapReply, ThrottleOutPacketType.Land); } - public void SendMapBlock(List mapBlocks) + public void SendMapBlock(List mapBlocks, uint flag) { MapBlockData[] mapBlocks2 = mapBlocks.ToArray(); @@ -1254,7 +1254,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP sendingBlocks.Add(mapBlocks2[i]); if (((i + 1) == mapBlocks2.Length) || ((i % maxsend) == 0)) { - SendMapBlockSplit(sendingBlocks); + SendMapBlockSplit(sendingBlocks, flag); sendingBlocks = new List(); } } 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); } /// diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index c6fd64c..a097f23 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs @@ -366,7 +366,7 @@ namespace OpenSim.Region.Examples.SimpleModule { } - public virtual void SendMapBlock(List mapBlocks) + public virtual void SendMapBlock(List mapBlocks, uint flag) { } -- cgit v1.1