Merge branch 'master' into vehicles

1 files changed, 2 insertions, 2 deletions

diff --git a/OpenSim/Framework/Capabilities/LLSD.cs b/OpenSim/Framework/Capabilities/LLSD.cs
index 84f43c1..eec9e61 100644
--- a/OpenSim/Framework/Capabilities/LLSD.cs
+++ b/OpenSim/Framework/Capabilities/LLSD.cs
@@ -112,7 +112,7 @@ namespace OpenSim.Framework.Capabilities
 
             writer.Close();
 
-            return Encoding.UTF8.GetBytes(sw.ToString());
+            return Util.UTF8.GetBytes(sw.ToString());
         }
 
         /// <summary>
@@ -329,7 +329,7 @@ namespace OpenSim.Framework.Capabilities
 
                         reader.Read();
                         FromBase64Transform b64 = new FromBase64Transform(FromBase64TransformMode.IgnoreWhiteSpaces);
-                        byte[] inp = Encoding.UTF8.GetBytes(reader.ReadString());
+                        byte[] inp = Util.UTF8.GetBytes(reader.ReadString());
                         ret = b64.TransformFinalBlock(inp, 0, inp.Length);
                         break;
                     }