* 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?

2 files changed, 2 insertions, 2 deletions

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
 
             httpResponse.StatusCode = (int)HttpStatusCode.OK;
 
-            return Encoding.UTF8.GetBytes(OSDParser.SerializeJsonString(resp));
+            return Util.UTF8.GetBytes(OSDParser.SerializeJsonString(resp));
         }
     }
 
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
 
             httpResponse.StatusCode = (int)HttpStatusCode.OK;
 
-            return Encoding.UTF8.GetBytes(OSDParser.SerializeJsonString(resp));
+            return Util.UTF8.GetBytes(OSDParser.SerializeJsonString(resp));
         }
     }