aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorAdam Frisby2007-05-30 04:32:30 +0000
committerAdam Frisby2007-05-30 04:32:30 +0000
commit84dc744faaf334f9c42fb988a38a8a67a0bdc6cc (patch)
tree74b2d68acabdde620fb86fb1dc2ac900f7dc7875 /OpenSim
parent* Bugfixes. Still not appearing correctly however. (diff)
downloadopensim-SC_OLD-84dc744faaf334f9c42fb988a38a8a67a0bdc6cc.zip
opensim-SC_OLD-84dc744faaf334f9c42fb988a38a8a67a0bdc6cc.tar.gz
opensim-SC_OLD-84dc744faaf334f9c42fb988a38a8a67a0bdc6cc.tar.bz2
opensim-SC_OLD-84dc744faaf334f9c42fb988a38a8a67a0bdc6cc.tar.xz
* 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.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs4
1 files changed, 3 insertions, 1 deletions
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 }