* 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.

2 files changed, 5 insertions, 3 deletions

diff --git a/OpenGridServices/OpenGridServices.GridServer/GridManager.cs b/OpenGridServices/OpenGridServices.GridServer/GridManager.cs
index 8d4517f..6315a4a 100644
--- a/OpenGridServices/OpenGridServices.GridServer/GridManager.cs
+++ b/OpenGridServices/OpenGridServices.GridServer/GridManager.cs
@@ -324,8 +324,8 @@ namespace OpenGridServices.GridServer
                 foreach (KeyValuePair<ulong, SimProfileData> aSim in neighbours)

                 {

                     Hashtable simProfileBlock = new Hashtable();

-                    simProfileBlock["x"] = aSim.Value.regionLocX;

-                    simProfileBlock["y"] = aSim.Value.regionLocY;

+                    simProfileBlock["x"] = aSim.Value.regionLocX.ToString();

+                    simProfileBlock["y"] = aSim.Value.regionLocY.ToString();

                     simProfileBlock["name"] = aSim.Value.regionName;

                     simProfileBlock["access"] = 21;

                     simProfileBlock["region-flags"] = 512;

diff --git a/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs b/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
index 4a978ab..b4192cc 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
@@ -153,7 +153,7 @@ namespace OpenSim
                 {

                     Hashtable mp = (Hashtable)simMapProfiles[iii];

                     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].Agents = System.Convert.ToByte(mp["agents"]);

                     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].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);

             }

         }