aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
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/Region/Environment
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/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/EstateManager.cs3
-rw-r--r--OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs3
3 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/EstateManager.cs b/OpenSim/Region/Environment/EstateManager.cs
index 39efecd..9c53f38 100644
--- a/OpenSim/Region/Environment/EstateManager.cs
+++ b/OpenSim/Region/Environment/EstateManager.cs
@@ -634,7 +634,8 @@ namespace OpenSim.Region.Environment
634 634
635 public void sendRegionInfoPacket(IClientAPI remote_client) 635 public void sendRegionInfoPacket(IClientAPI remote_client)
636 { 636 {
637 Encoding _enc = Encoding.ASCII; 637 // ENCODING FAULT
638 Encoding _enc = Encoding.UTF8;
638 639
639 AgentCircuitData circuitData = remote_client.RequestClientInfo(); 640 AgentCircuitData circuitData = remote_client.RequestClientInfo();
640 641
diff --git a/OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs b/OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs
index ebc8568..10e3840 100644
--- a/OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs
@@ -328,7 +328,7 @@ namespace OpenSim.Region.Environment.Modules
328 if (count != 0) 328 if (count != 0)
329 { 329 {
330 // translate from bytes to ASCII text 330 // translate from bytes to ASCII text
331 tempString = Encoding.ASCII.GetString(buf, 0, count); 331 tempString = Encoding.UTF8.GetString(buf, 0, count);
332 332
333 // continue building the string 333 // continue building the string
334 sb.Append(tempString); 334 sb.Append(tempString);
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 327956e..b0ed04e 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -45,7 +45,8 @@ namespace OpenSim.Region.Environment.Scenes
45 45
46 public partial class SceneObjectGroup : EntityBase 46 public partial class SceneObjectGroup : EntityBase
47 { 47 {
48 private Encoding enc = Encoding.ASCII; 48 // ENCODING FAULT
49 private Encoding enc = Encoding.UTF8;
49 50
50 protected SceneObjectPart m_rootPart; 51 protected SceneObjectPart m_rootPart;
51 52