diff options
| author | Melanie | 2009-10-04 05:49:16 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-04 05:49:16 +0100 |
| commit | 6878b26b0d3d9ba26b1afe097e193fb1bafbc9b6 (patch) | |
| tree | 7e786c0ce436f42a60806629f3249658eab4884a /OpenSim/Region/ClientStack | |
| parent | Slightly better message with status code for WebException. (diff) | |
| parent | Closing another stream. (diff) | |
| download | opensim-SC_OLD-6878b26b0d3d9ba26b1afe097e193fb1bafbc9b6.zip opensim-SC_OLD-6878b26b0d3d9ba26b1afe097e193fb1bafbc9b6.tar.gz opensim-SC_OLD-6878b26b0d3d9ba26b1afe097e193fb1bafbc9b6.tar.bz2 opensim-SC_OLD-6878b26b0d3d9ba26b1afe097e193fb1bafbc9b6.tar.xz | |
Merge branch 'diva-textures-osgrid'
Diffstat (limited to 'OpenSim/Region/ClientStack')
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 3b43771..0052729 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
| @@ -4751,7 +4751,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 4751 | { | 4751 | { |
| 4752 | Hashtable mp = (Hashtable)simMapProfiles[iii]; | 4752 | Hashtable mp = (Hashtable)simMapProfiles[iii]; |
| 4753 | mbReply.Data[iii] = new MapBlockReplyPacket.DataBlock(); | 4753 | mbReply.Data[iii] = new MapBlockReplyPacket.DataBlock(); |
| 4754 | mbReply.Data[iii].Name = System.Text.Encoding.UTF8.GetBytes((string)mp["name"]); | 4754 | mbReply.Data[iii].Name = Util.UTF8.GetBytes((string)mp["name"]); |
| 4755 | mbReply.Data[iii].Access = System.Convert.ToByte(mp["access"]); | 4755 | mbReply.Data[iii].Access = System.Convert.ToByte(mp["access"]); |
| 4756 | mbReply.Data[iii].Agents = System.Convert.ToByte(mp["agents"]); | 4756 | mbReply.Data[iii].Agents = System.Convert.ToByte(mp["agents"]); |
| 4757 | mbReply.Data[iii].MapImageID = new UUID((string)mp["map-image-id"]); | 4757 | mbReply.Data[iii].MapImageID = new UUID((string)mp["map-image-id"]); |
| @@ -7341,7 +7341,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 7341 | } | 7341 | } |
| 7342 | #endregion | 7342 | #endregion |
| 7343 | 7343 | ||
| 7344 | string mapName = Encoding.UTF8.GetString(map.NameData.Name, 0, | 7344 | string mapName = Util.UTF8.GetString(map.NameData.Name, 0, |
| 7345 | map.NameData.Name.Length - 1); | 7345 | map.NameData.Name.Length - 1); |
| 7346 | handlerMapNameRequest = OnMapNameRequest; | 7346 | handlerMapNameRequest = OnMapNameRequest; |
| 7347 | if (handlerMapNameRequest != null) | 7347 | if (handlerMapNameRequest != null) |