aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorAdam Frisby2008-03-21 02:26:00 +0000
committerAdam Frisby2008-03-21 02:26:00 +0000
commit7286bd60b07e809f33215256cc71b39c15437c65 (patch)
treea3d55e49cfcbc9a756e0816ac5ea8b9d97f26082 /OpenSim/Framework
parent* Fix for #499: linked primsets don't rotate properly when using a door scrip... (diff)
downloadopensim-SC_OLD-7286bd60b07e809f33215256cc71b39c15437c65.zip
opensim-SC_OLD-7286bd60b07e809f33215256cc71b39c15437c65.tar.gz
opensim-SC_OLD-7286bd60b07e809f33215256cc71b39c15437c65.tar.bz2
opensim-SC_OLD-7286bd60b07e809f33215256cc71b39c15437c65.tar.xz
* Converted a large number of ASCII encodings to UTF8.
* We should not be using ASCII anywhere except for legacy compatibility reasons. * A large number of UTF8 Encoders are being used in places where we should be using Util.StringToField instead. These have been tagged with // ENCODING FAULT * This should fix Mantis#799 - Japanese Profile Text does not work.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSD.cs2
-rw-r--r--OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSD.cs b/OpenSim/Framework/Communications/Capabilities/LLSD.cs
index 8e2a194..b3e841c 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSD.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSD.cs
@@ -329,7 +329,7 @@ namespace OpenSim.Region.Capabilities
329 329
330 reader.Read(); 330 reader.Read();
331 FromBase64Transform b64 = new FromBase64Transform(FromBase64TransformMode.IgnoreWhiteSpaces); 331 FromBase64Transform b64 = new FromBase64Transform(FromBase64TransformMode.IgnoreWhiteSpaces);
332 byte[] inp = Encoding.ASCII.GetBytes(reader.ReadString()); 332 byte[] inp = Encoding.UTF8.GetBytes(reader.ReadString());
333 ret = b64.TransformFinalBlock(inp, 0, inp.Length); 333 ret = b64.TransformFinalBlock(inp, 0, inp.Length);
334 break; 334 break;
335 } 335 }
diff --git a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
index fa8d8fe..1fb4866 100644
--- a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
+++ b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
@@ -74,7 +74,7 @@ namespace OpenSim.Framework.Configuration.HTTP
74 count = resStream.Read(buf, 0, buf.Length); 74 count = resStream.Read(buf, 0, buf.Length);
75 if (count != 0) 75 if (count != 0)
76 { 76 {
77 tempString = Encoding.ASCII.GetString(buf, 0, count); 77 tempString = Encoding.UTF8.GetString(buf, 0, count);
78 sb.Append(tempString); 78 sb.Append(tempString);
79 } 79 }
80 } while (count > 0); 80 } while (count > 0);