OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added the flag param to IClientAPI.SendMapBlock

0.6.0-stable
MW 2008-06-25 20:14:47 +00:00
parent 35e1a2fdfc
commit cf1cf73839
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/IClientAPI.cs
View File

@ -869,7 +869,7 @@ namespace OpenSim.Framework
void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint, void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint,
string capsURL); string capsURL);
void SendMapBlock(List<MapBlockData> mapBlocks); void SendMapBlock(List<MapBlockData> mapBlocks, uint flag);
void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags); void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags);
void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID,

8
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -1211,7 +1211,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
OutPacket(newSimPack, ThrottleOutPacketType.Unknown); OutPacket(newSimPack, ThrottleOutPacketType.Unknown);
} }
internal void SendMapBlockSplit(List<MapBlockData> mapBlocks) internal void SendMapBlockSplit(List<MapBlockData> mapBlocks, uint flag)
{ {
MapBlockReplyPacket mapReply = (MapBlockReplyPacket)PacketPool.Instance.GetPacket(PacketType.MapBlockReply); MapBlockReplyPacket mapReply = (MapBlockReplyPacket)PacketPool.Instance.GetPacket(PacketType.MapBlockReply);
// TODO: don't create new blocks if recycling an old packet // 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.AgentData.AgentID = AgentId;
mapReply.Data = new MapBlockReplyPacket.DataBlock[mapBlocks2.Length]; mapReply.Data = new MapBlockReplyPacket.DataBlock[mapBlocks2.Length];
mapReply.AgentData.Flags = 0; mapReply.AgentData.Flags = flag;
for (int i = 0; i < mapBlocks2.Length; i++) for (int i = 0; i < mapBlocks2.Length; i++)
{ {
@ -1238,7 +1238,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
OutPacket(mapReply, ThrottleOutPacketType.Land); OutPacket(mapReply, ThrottleOutPacketType.Land);
} }
public void SendMapBlock(List<MapBlockData> mapBlocks) public void SendMapBlock(List<MapBlockData> mapBlocks, uint flag)
{ {
MapBlockData[] mapBlocks2 = mapBlocks.ToArray(); MapBlockData[] mapBlocks2 = mapBlocks.ToArray();
@ -1254,7 +1254,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
sendingBlocks.Add(mapBlocks2[i]); sendingBlocks.Add(mapBlocks2[i]);
if (((i + 1) == mapBlocks2.Length) || ((i % maxsend) == 0)) if (((i + 1) == mapBlocks2.Length) || ((i % maxsend) == 0))
{ {
SendMapBlockSplit(sendingBlocks); SendMapBlockSplit(sendingBlocks, flag);
sendingBlocks = new List<MapBlockData>(); sendingBlocks = new List<MapBlockData>();
} }
} }

2
OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
View File

@ -452,7 +452,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
{ {
} }
public virtual void SendMapBlock(List<MapBlockData> mapBlocks) public virtual void SendMapBlock(List<MapBlockData> mapBlocks, uint flag)
{ {
} }

6
OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs
View File

@ -155,7 +155,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
List<MapBlockData> mapBlocks; List<MapBlockData> mapBlocks;
mapBlocks = cachedMapBlocks; mapBlocks = cachedMapBlocks;
avatarPresence.ControllingClient.SendMapBlock(mapBlocks); avatarPresence.ControllingClient.SendMapBlock(mapBlocks, 0);
} }
else else
{ {
@ -167,7 +167,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
List<MapBlockData> mapBlocks; List<MapBlockData> 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); 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) lock (cachedMapBlocks)
cachedMapBlocks = mapBlocks; cachedMapBlocks = mapBlocks;
@ -245,7 +245,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
{ {
List<MapBlockData> mapBlocks; List<MapBlockData> mapBlocks;
mapBlocks = m_scene.SceneGridService.RequestNeighbourMapBlocks(minX - 4, minY - 4, minX + 4, minY + 4); 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) public Hashtable OnHTTPGetMapImage(Hashtable keysvals)

2
OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
View File

@ -542,7 +542,7 @@ namespace OpenSim.Region.Environment.Scenes
{ {
List<MapBlockData> mapBlocks; List<MapBlockData> mapBlocks;
mapBlocks = m_commsProvider.GridService.RequestNeighbourMapBlocks(minX - 4, minY - 4, minX + 4, minY + 4); mapBlocks = m_commsProvider.GridService.RequestNeighbourMapBlocks(minX - 4, minY - 4, minX + 4, minY + 4);
remoteClient.SendMapBlock(mapBlocks); remoteClient.SendMapBlock(mapBlocks, 0);
} }
/// <summary> /// <summary>

2
OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
View File

@ -366,7 +366,7 @@ namespace OpenSim.Region.Examples.SimpleModule
{ {
} }
public virtual void SendMapBlock(List<MapBlockData> mapBlocks) public virtual void SendMapBlock(List<MapBlockData> mapBlocks, uint flag)
{ {
} }