* World map! Yay!

* Using ASCII encoding for text not UTF8 encoding (causes the client to burp)
* Cannot send uints via Nwc.XmlRpc - it asplodes and returns zero.
zircon^2
Adam Frisby 2007-05-30 04:32:30 +00:00
parent 88003c41a9
commit 84dc744faa
2 changed files with 5 additions and 3 deletions

View File

@ -324,8 +324,8 @@ namespace OpenGridServices.GridServer
foreach (KeyValuePair<ulong, SimProfileData> aSim in neighbours) foreach (KeyValuePair<ulong, SimProfileData> aSim in neighbours)
{ {
Hashtable simProfileBlock = new Hashtable(); Hashtable simProfileBlock = new Hashtable();
simProfileBlock["x"] = aSim.Value.regionLocX; simProfileBlock["x"] = aSim.Value.regionLocX.ToString();
simProfileBlock["y"] = aSim.Value.regionLocY; simProfileBlock["y"] = aSim.Value.regionLocY.ToString();
simProfileBlock["name"] = aSim.Value.regionName; simProfileBlock["name"] = aSim.Value.regionName;
simProfileBlock["access"] = 21; simProfileBlock["access"] = 21;
simProfileBlock["region-flags"] = 512; simProfileBlock["region-flags"] = 512;

View File

@ -153,7 +153,7 @@ namespace OpenSim
{ {
Hashtable mp = (Hashtable)simMapProfiles[iii]; Hashtable mp = (Hashtable)simMapProfiles[iii];
mbReply.Data[iii] = new MapBlockReplyPacket.DataBlock(); mbReply.Data[iii] = new MapBlockReplyPacket.DataBlock();
mbReply.Data[iii].Name = System.Text.Encoding.UTF8.GetBytes((string)mp["name"]); mbReply.Data[iii].Name = System.Text.Encoding.ASCII.GetBytes((string)mp["name"]);
mbReply.Data[iii].Access = System.Convert.ToByte(mp["access"]); mbReply.Data[iii].Access = System.Convert.ToByte(mp["access"]);
mbReply.Data[iii].Agents = System.Convert.ToByte(mp["agents"]); mbReply.Data[iii].Agents = System.Convert.ToByte(mp["agents"]);
mbReply.Data[iii].MapImageID = new LLUUID((string)mp["map-image-id"]); mbReply.Data[iii].MapImageID = new LLUUID((string)mp["map-image-id"]);
@ -162,6 +162,8 @@ namespace OpenSim
mbReply.Data[iii].X = System.Convert.ToUInt16(mp["x"]); mbReply.Data[iii].X = System.Convert.ToUInt16(mp["x"]);
mbReply.Data[iii].Y = System.Convert.ToUInt16(mp["y"]); mbReply.Data[iii].Y = System.Convert.ToUInt16(mp["y"]);
} }
//Console.WriteLine("ADAMDEBUG: Queuing MapBlockReply #" + i.ToString() + " Contains " + iii.ToString() + " region(s)");
//Console.WriteLine(mbReply.ToString());
this.OutPacket(mbReply); this.OutPacket(mbReply);
} }
} }