aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-02 18:31:08 -0700
committerJohn Hurliman2009-10-02 18:31:08 -0700
commit387e9f7a7faeb412054383080afc3507a1522746 (patch)
tree522470dd28074f7e114547476968942c05e866aa /OpenSim/Region/ClientStack
parentMerge branch 'diva-textures-osgrid' of ssh://opensimulator.org/var/git/opensi... (diff)
downloadopensim-SC_OLD-387e9f7a7faeb412054383080afc3507a1522746.zip
opensim-SC_OLD-387e9f7a7faeb412054383080afc3507a1522746.tar.gz
opensim-SC_OLD-387e9f7a7faeb412054383080afc3507a1522746.tar.bz2
opensim-SC_OLD-387e9f7a7faeb412054383080afc3507a1522746.tar.xz
* Creates Util.UTF8 and switches some references of Encoding.UTF8 to Util.UTF8 (not all references were switched since not all OpenSim libraries reference OpenSim.Framework)
* Shrinks the largest in-memory object, the LLRAW.HeightmapLookupValue struct (only used for exporting to LLRAW terrain files), to the minimum possible size. This seems to have the odd side effect of cutting the size of the two double[256,256] terrain objects in half. Possibly an alignment optimization?
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 43d29fd..3f90004 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -4748,7 +4748,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4748 { 4748 {
4749 Hashtable mp = (Hashtable)simMapProfiles[iii]; 4749 Hashtable mp = (Hashtable)simMapProfiles[iii];
4750 mbReply.Data[iii] = new MapBlockReplyPacket.DataBlock(); 4750 mbReply.Data[iii] = new MapBlockReplyPacket.DataBlock();
4751 mbReply.Data[iii].Name = System.Text.Encoding.UTF8.GetBytes((string)mp["name"]); 4751 mbReply.Data[iii].Name = Util.UTF8.GetBytes((string)mp["name"]);
4752 mbReply.Data[iii].Access = System.Convert.ToByte(mp["access"]); 4752 mbReply.Data[iii].Access = System.Convert.ToByte(mp["access"]);
4753 mbReply.Data[iii].Agents = System.Convert.ToByte(mp["agents"]); 4753 mbReply.Data[iii].Agents = System.Convert.ToByte(mp["agents"]);
4754 mbReply.Data[iii].MapImageID = new UUID((string)mp["map-image-id"]); 4754 mbReply.Data[iii].MapImageID = new UUID((string)mp["map-image-id"]);
@@ -7338,7 +7338,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
7338 } 7338 }
7339 #endregion 7339 #endregion
7340 7340
7341 string mapName = Encoding.UTF8.GetString(map.NameData.Name, 0, 7341 string mapName = Util.UTF8.GetString(map.NameData.Name, 0,
7342 map.NameData.Name.Length - 1); 7342 map.NameData.Name.Length - 1);
7343 handlerMapNameRequest = OnMapNameRequest; 7343 handlerMapNameRequest = OnMapNameRequest;
7344 if (handlerMapNameRequest != null) 7344 if (handlerMapNameRequest != null)