aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenGridServices/OpenGridServices.GridServer/GridManager.cs4
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs4
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
324 foreach (KeyValuePair<ulong, SimProfileData> aSim in neighbours) 324 foreach (KeyValuePair<ulong, SimProfileData> aSim in neighbours)
325 { 325 {
326 Hashtable simProfileBlock = new Hashtable(); 326 Hashtable simProfileBlock = new Hashtable();
327 simProfileBlock["x"] = aSim.Value.regionLocX; 327 simProfileBlock["x"] = aSim.Value.regionLocX.ToString();
328 simProfileBlock["y"] = aSim.Value.regionLocY; 328 simProfileBlock["y"] = aSim.Value.regionLocY.ToString();
329 simProfileBlock["name"] = aSim.Value.regionName; 329 simProfileBlock["name"] = aSim.Value.regionName;
330 simProfileBlock["access"] = 21; 330 simProfileBlock["access"] = 21;
331 simProfileBlock["region-flags"] = 512; 331 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
153 { 153 {
154 Hashtable mp = (Hashtable)simMapProfiles[iii]; 154 Hashtable mp = (Hashtable)simMapProfiles[iii];
155 mbReply.Data[iii] = new MapBlockReplyPacket.DataBlock(); 155 mbReply.Data[iii] = new MapBlockReplyPacket.DataBlock();
156 mbReply.Data[iii].Name = System.Text.Encoding.UTF8.GetBytes((string)mp["name"]); 156 mbReply.Data[iii].Name = System.Text.Encoding.ASCII.GetBytes((string)mp["name"]);
157 mbReply.Data[iii].Access = System.Convert.ToByte(mp["access"]); 157 mbReply.Data[iii].Access = System.Convert.ToByte(mp["access"]);
158 mbReply.Data[iii].Agents = System.Convert.ToByte(mp["agents"]); 158 mbReply.Data[iii].Agents = System.Convert.ToByte(mp["agents"]);
159 mbReply.Data[iii].MapImageID = new LLUUID((string)mp["map-image-id"]); 159 mbReply.Data[iii].MapImageID = new LLUUID((string)mp["map-image-id"]);
@@ -162,6 +162,8 @@ namespace OpenSim
162 mbReply.Data[iii].X = System.Convert.ToUInt16(mp["x"]); 162 mbReply.Data[iii].X = System.Convert.ToUInt16(mp["x"]);
163 mbReply.Data[iii].Y = System.Convert.ToUInt16(mp["y"]); 163 mbReply.Data[iii].Y = System.Convert.ToUInt16(mp["y"]);
164 } 164 }
165 //Console.WriteLine("ADAMDEBUG: Queuing MapBlockReply #" + i.ToString() + " Contains " + iii.ToString() + " region(s)");
166 //Console.WriteLine(mbReply.ToString());
165 this.OutPacket(mbReply); 167 this.OutPacket(mbReply);
166 } 168 }
167 } 169 }