diff options
author | John Hurliman | 2009-10-02 18:31:08 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-02 18:31:08 -0700 |
commit | 387e9f7a7faeb412054383080afc3507a1522746 (patch) | |
tree | 522470dd28074f7e114547476968942c05e866aa /OpenSim/Server | |
parent | Merge branch 'diva-textures-osgrid' of ssh://opensimulator.org/var/git/opensi... (diff) | |
download | opensim-SC-387e9f7a7faeb412054383080afc3507a1522746.zip opensim-SC-387e9f7a7faeb412054383080afc3507a1522746.tar.gz opensim-SC-387e9f7a7faeb412054383080afc3507a1522746.tar.bz2 opensim-SC-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 '')
-rw-r--r-- | OpenSim/Server/Base/ServerUtils.cs | 2 | ||||
-rw-r--r-- | OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs | 2 | ||||
-rw-r--r-- | OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs index 0a36bbe..6e8ead0 100644 --- a/OpenSim/Server/Base/ServerUtils.cs +++ b/OpenSim/Server/Base/ServerUtils.cs | |||
@@ -87,7 +87,7 @@ namespace OpenSim.Server.Base | |||
87 | public static byte[] SerializeResult(XmlSerializer xs, object data) | 87 | public static byte[] SerializeResult(XmlSerializer xs, object data) |
88 | { | 88 | { |
89 | MemoryStream ms = new MemoryStream(); | 89 | MemoryStream ms = new MemoryStream(); |
90 | XmlTextWriter xw = new XmlTextWriter(ms, Encoding.UTF8); | 90 | XmlTextWriter xw = new XmlTextWriter(ms, Util.UTF8); |
91 | xw.Formatting = Formatting.Indented; | 91 | xw.Formatting = Formatting.Indented; |
92 | xs.Serialize(xw, data); | 92 | xs.Serialize(xw, data); |
93 | xw.Flush(); | 93 | xw.Flush(); |
diff --git a/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs b/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs index c0933a8..7aedc1a 100644 --- a/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs +++ b/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs | |||
@@ -156,7 +156,7 @@ namespace OpenSim.Server.Handlers.Neighbour | |||
156 | 156 | ||
157 | httpResponse.StatusCode = (int)HttpStatusCode.OK; | 157 | httpResponse.StatusCode = (int)HttpStatusCode.OK; |
158 | 158 | ||
159 | return Encoding.UTF8.GetBytes(OSDParser.SerializeJsonString(resp)); | 159 | return Util.UTF8.GetBytes(OSDParser.SerializeJsonString(resp)); |
160 | } | 160 | } |
161 | } | 161 | } |
162 | 162 | ||
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs index 822edcb..3da72c7 100644 --- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs +++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | |||
@@ -161,7 +161,7 @@ namespace OpenSim.Server.Handlers.Simulation | |||
161 | 161 | ||
162 | httpResponse.StatusCode = (int)HttpStatusCode.OK; | 162 | httpResponse.StatusCode = (int)HttpStatusCode.OK; |
163 | 163 | ||
164 | return Encoding.UTF8.GetBytes(OSDParser.SerializeJsonString(resp)); | 164 | return Util.UTF8.GetBytes(OSDParser.SerializeJsonString(resp)); |
165 | } | 165 | } |
166 | } | 166 | } |
167 | 167 | ||