aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/IClientAPI.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs8
-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
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs2
6 files changed, 11 insertions, 11 deletions
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
869 void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint, 869 void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint,
870 string capsURL); 870 string capsURL);
871 871
872 void SendMapBlock(List<MapBlockData> mapBlocks); 872 void SendMapBlock(List<MapBlockData> mapBlocks, uint flag);
873 void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags); 873 void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags);
874 874
875 void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, 875 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
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 }
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>
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
366 { 366 {
367 } 367 }
368 368
369 public virtual void SendMapBlock(List<MapBlockData> mapBlocks) 369 public virtual void SendMapBlock(List<MapBlockData> mapBlocks, uint flag)
370 { 370 {
371 } 371 }
372 372