aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Util.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Util.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 728cda0..384f716 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -148,6 +148,7 @@ namespace OpenSim.Framework
148 } 148 }
149 149
150 public static Encoding UTF8 = Encoding.UTF8; 150 public static Encoding UTF8 = Encoding.UTF8;
151 public static Encoding UTF8NoBomEncoding = new UTF8Encoding(false);
151 152
152 /// <value> 153 /// <value>
153 /// Well known UUID for the blank texture used in the Linden SL viewer version 1.20 (and hopefully onwards) 154 /// Well known UUID for the blank texture used in the Linden SL viewer version 1.20 (and hopefully onwards)
@@ -1248,8 +1249,7 @@ namespace OpenSim.Framework
1248 1249
1249 public static string Base64ToString(string str) 1250 public static string Base64ToString(string str)
1250 { 1251 {
1251 UTF8Encoding encoder = new UTF8Encoding(); 1252 Decoder utf8Decode = Encoding.UTF8.GetDecoder();
1252 Decoder utf8Decode = encoder.GetDecoder();
1253 1253
1254 byte[] todecode_byte = Convert.FromBase64String(str); 1254 byte[] todecode_byte = Convert.FromBase64String(str);
1255 int charCount = utf8Decode.GetCharCount(todecode_byte, 0, todecode_byte.Length); 1255 int charCount = utf8Decode.GetCharCount(todecode_byte, 0, todecode_byte.Length);