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

* May have fixed issues with the world map.

zircon^2
Adam Frisby 2007-05-30 03:58:27 +00:00
parent c7e8318038
commit 6f9aba58ee
2 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
View File

@ -123,41 +123,47 @@ namespace OpenSim
mapReply.AgentData.Flags = 0; mapReply.AgentData.Flags = 0;
mapReply.LayerData = new MapLayerReplyPacket.LayerDataBlock[1]; mapReply.LayerData = new MapLayerReplyPacket.LayerDataBlock[1];
mapReply.LayerData[0] = new MapLayerReplyPacket.LayerDataBlock(); mapReply.LayerData[0] = new MapLayerReplyPacket.LayerDataBlock();
mapReply.LayerData[0].Bottom = 800; mapReply.LayerData[0].Bottom = this.m_regionData.RegionLocY - 50;
mapReply.LayerData[0].Left = 800; mapReply.LayerData[0].Left = this.m_regionData.RegionLocX - 50;
mapReply.LayerData[0].Top = 1200; mapReply.LayerData[0].Top = this.m_regionData.RegionLocY + 50;
mapReply.LayerData[0].Right = 1200; mapReply.LayerData[0].Right = this.m_regionData.RegionLocX + 50;
mapReply.LayerData[0].ImageID = new LLUUID("00000000-0000-0000-9999-000000000006"); mapReply.LayerData[0].ImageID = new LLUUID("00000000-0000-0000-9999-000000000005");
this.OutPacket(mapReply); this.OutPacket(mapReply);
} }
public void RequestMapBlocks(int minX, int minY, int maxX, int maxY) public void RequestMapBlocks(int minX, int minY, int maxX, int maxY)
{ {
IList simMapProfiles = m_gridServer.RequestMapBlocks(minX, minY, maxX, maxY); IList simMapProfiles = m_gridServer.RequestMapBlocks(minX, minY, maxX, maxY);
MapBlockReplyPacket mbReply = new MapBlockReplyPacket();
mbReply.AgentData.AgentID = this.AgentID;
int len; int len;
if (simMapProfiles == null) if (simMapProfiles == null)
len = 0; len = 0;
else else
len = simMapProfiles.Count; len = simMapProfiles.Count;
mbReply.Data = new MapBlockReplyPacket.DataBlock[len]; int i;
int iii; int mtu = 8; // Number of regions to send per packet. Will be more precise in future. ( TODO )
for (iii = 0; iii < len; iii++) for (i = 0; i < len; i += mtu)
{ {
Hashtable mp = (Hashtable)simMapProfiles[iii]; MapBlockReplyPacket mbReply = new MapBlockReplyPacket();
mbReply.Data[iii] = new MapBlockReplyPacket.DataBlock(); mbReply.AgentData.AgentID = this.AgentID;
mbReply.Data[iii].Name = System.Text.Encoding.UTF8.GetBytes((string)mp["name"]);
mbReply.Data[iii].Access = System.Convert.ToByte(mp["access"]); mbReply.Data = new MapBlockReplyPacket.DataBlock[len];
mbReply.Data[iii].Agents = System.Convert.ToByte(mp["agents"]); int iii;
mbReply.Data[iii].MapImageID = new LLUUID((string)mp["map-image-id"]); for (iii = i; iii < (i + mtu); iii++)
mbReply.Data[iii].RegionFlags = System.Convert.ToUInt32(mp["region-flags"]); {
mbReply.Data[iii].WaterHeight = System.Convert.ToByte(mp["water-height"]); Hashtable mp = (Hashtable)simMapProfiles[iii];
mbReply.Data[iii].X = System.Convert.ToUInt16(mp["x"]); mbReply.Data[iii] = new MapBlockReplyPacket.DataBlock();
mbReply.Data[iii].Y = System.Convert.ToUInt16(mp["y"]); mbReply.Data[iii].Name = System.Text.Encoding.UTF8.GetBytes((string)mp["name"]);
mbReply.Data[iii].Access = System.Convert.ToByte(mp["access"]);
mbReply.Data[iii].Agents = System.Convert.ToByte(mp["agents"]);
mbReply.Data[iii].MapImageID = new LLUUID((string)mp["map-image-id"]);
mbReply.Data[iii].RegionFlags = System.Convert.ToUInt32(mp["region-flags"]);
mbReply.Data[iii].WaterHeight = System.Convert.ToByte(mp["water-height"]);
mbReply.Data[iii].X = System.Convert.ToUInt16(mp["x"]);
mbReply.Data[iii].Y = System.Convert.ToUInt16(mp["y"]);
}
this.OutPacket(mbReply);
} }
this.OutPacket(mbReply);
} }
} }
} }

14
OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
View File

@ -350,13 +350,21 @@ namespace OpenSim
} }
break; break;
case PacketType.MapLayerRequest: case PacketType.MapLayerRequest:
// This be busted.
MapLayerRequestPacket MapRequest = (MapLayerRequestPacket)Pack;
this.RequestMapLayer(); this.RequestMapLayer();
this.RequestMapBlocks((int)this.m_regionData.RegionLocX - 50, (int)this.m_regionData.RegionLocY - 50, (int)this.m_regionData.RegionLocX + 50, (int)this.m_regionData.RegionLocY + 50);
break; break;
case PacketType.MapBlockRequest:
MapBlockRequestPacket MapRequest = (MapBlockRequestPacket)Pack;
this.RequestMapBlocks(MapRequest.PositionData.MinX, MapRequest.PositionData.MinY, MapRequest.PositionData.MaxX, MapRequest.PositionData.MaxY); case PacketType.MapBlockRequest:
MapBlockRequestPacket MapBRequest = (MapBlockRequestPacket)Pack;
this.RequestMapBlocks(MapBRequest.PositionData.MinX, MapBRequest.PositionData.MinY, MapBRequest.PositionData.MaxX, MapBRequest.PositionData.MaxY);
break; break;
case PacketType.MapNameRequest:
// TODO.
break;
case PacketType.TeleportLandmarkRequest: case PacketType.TeleportLandmarkRequest:
TeleportLandmarkRequestPacket tpReq = (TeleportLandmarkRequestPacket)Pack; TeleportLandmarkRequestPacket tpReq = (TeleportLandmarkRequestPacket)Pack;