diff options
added the flag param to IClientAPI.SendMapBlock
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 8 |
1 files changed, 4 insertions, 4 deletions
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 | |||
1211 | OutPacket(newSimPack, ThrottleOutPacketType.Unknown); | 1211 | OutPacket(newSimPack, ThrottleOutPacketType.Unknown); |
1212 | } | 1212 | } |
1213 | 1213 | ||
1214 | internal void SendMapBlockSplit(List<MapBlockData> mapBlocks) | 1214 | internal void SendMapBlockSplit(List<MapBlockData> mapBlocks, uint flag) |
1215 | { | 1215 | { |
1216 | MapBlockReplyPacket mapReply = (MapBlockReplyPacket)PacketPool.Instance.GetPacket(PacketType.MapBlockReply); | 1216 | MapBlockReplyPacket mapReply = (MapBlockReplyPacket)PacketPool.Instance.GetPacket(PacketType.MapBlockReply); |
1217 | // TODO: don't create new blocks if recycling an old packet | 1217 | // TODO: don't create new blocks if recycling an old packet |
@@ -1220,7 +1220,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1220 | 1220 | ||
1221 | mapReply.AgentData.AgentID = AgentId; | 1221 | mapReply.AgentData.AgentID = AgentId; |
1222 | mapReply.Data = new MapBlockReplyPacket.DataBlock[mapBlocks2.Length]; | 1222 | mapReply.Data = new MapBlockReplyPacket.DataBlock[mapBlocks2.Length]; |
1223 | mapReply.AgentData.Flags = 0; | 1223 | mapReply.AgentData.Flags = flag; |
1224 | 1224 | ||
1225 | for (int i = 0; i < mapBlocks2.Length; i++) | 1225 | for (int i = 0; i < mapBlocks2.Length; i++) |
1226 | { | 1226 | { |
@@ -1238,7 +1238,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1238 | OutPacket(mapReply, ThrottleOutPacketType.Land); | 1238 | OutPacket(mapReply, ThrottleOutPacketType.Land); |
1239 | } | 1239 | } |
1240 | 1240 | ||
1241 | public void SendMapBlock(List<MapBlockData> mapBlocks) | 1241 | public void SendMapBlock(List<MapBlockData> mapBlocks, uint flag) |
1242 | { | 1242 | { |
1243 | 1243 | ||
1244 | MapBlockData[] mapBlocks2 = mapBlocks.ToArray(); | 1244 | MapBlockData[] mapBlocks2 = mapBlocks.ToArray(); |
@@ -1254,7 +1254,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1254 | sendingBlocks.Add(mapBlocks2[i]); | 1254 | sendingBlocks.Add(mapBlocks2[i]); |
1255 | if (((i + 1) == mapBlocks2.Length) || ((i % maxsend) == 0)) | 1255 | if (((i + 1) == mapBlocks2.Length) || ((i % maxsend) == 0)) |
1256 | { | 1256 | { |
1257 | SendMapBlockSplit(sendingBlocks); | 1257 | SendMapBlockSplit(sendingBlocks, flag); |
1258 | sendingBlocks = new List<MapBlockData>(); | 1258 | sendingBlocks = new List<MapBlockData>(); |
1259 | } | 1259 | } |
1260 | } | 1260 | } |