Merge branch 'diva-textures-osgrid'

1 files changed, 6 insertions, 4 deletions

diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 17fc58c..0851d26 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -103,6 +103,8 @@ namespace OpenSim.Framework
         }
 
 
+        public static Encoding UTF8 = Encoding.UTF8;
+
         /// <value>
         /// Well known UUID for the blank texture used in the Linden SL viewer version 1.20 (and hopefully onwards) 
         /// </value>
@@ -465,7 +467,7 @@ namespace OpenSim.Framework
                     output.Append(": ");
                 }
 
-                output.Append(CleanString(Encoding.UTF8.GetString(bytes, 0, bytes.Length - 1)));
+                output.Append(CleanString(Util.UTF8.GetString(bytes, 0, bytes.Length - 1)));
             }
             else
             {
@@ -826,7 +828,7 @@ namespace OpenSim.Framework
 
         public static string Compress(string text)
         {
-            byte[] buffer = Encoding.UTF8.GetBytes(text);
+            byte[] buffer = Util.UTF8.GetBytes(text);
             MemoryStream memory = new MemoryStream();
             using (GZipStream compressor = new GZipStream(memory, CompressionMode.Compress, true))
             {
@@ -860,7 +862,7 @@ namespace OpenSim.Framework
                     decompressor.Read(buffer, 0, buffer.Length);
                 }
 
-                return Encoding.UTF8.GetString(buffer);
+                return Util.UTF8.GetString(buffer);
             }
         }
 
@@ -1132,7 +1134,7 @@ namespace OpenSim.Framework
         {
             byte[] data = new byte[length];
             stream.Read(data, 0, length);
-            string strdata = Encoding.UTF8.GetString(data);
+            string strdata = Util.UTF8.GetString(data);
             OSDMap args = null;
             OSD buffer;
             buffer = OSDParser.DeserializeJson(strdata);