diff options
author | Adam Frisby | 2008-03-21 02:32:56 +0000 |
---|---|---|
committer | Adam Frisby | 2008-03-21 02:32:56 +0000 |
commit | fd8aa566b55f8ced07ea274c041625833e31d4d5 (patch) | |
tree | 1add6129e82357f77711c9b3a186f626c6234ea7 /OpenSim | |
parent | * Converted a large number of ASCII encodings to UTF8. (diff) | |
download | opensim-SC_OLD-fd8aa566b55f8ced07ea274c041625833e31d4d5.zip opensim-SC_OLD-fd8aa566b55f8ced07ea274c041625833e31d4d5.tar.gz opensim-SC_OLD-fd8aa566b55f8ced07ea274c041625833e31d4d5.tar.bz2 opensim-SC_OLD-fd8aa566b55f8ced07ea274c041625833e31d4d5.tar.xz |
* Removed a bad encoder.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.cs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs index 0215994..23354a1 100644 --- a/OpenSim/Region/ClientStack/ClientView.cs +++ b/OpenSim/Region/ClientStack/ClientView.cs | |||
@@ -84,8 +84,6 @@ namespace OpenSim.Region.ClientStack | |||
84 | private int m_lastPacketsReceived = 0; | 84 | private int m_lastPacketsReceived = 0; |
85 | private byte[] ZeroOutBuffer = new byte[4096]; | 85 | private byte[] ZeroOutBuffer = new byte[4096]; |
86 | 86 | ||
87 | // ENCODING FAULT | ||
88 | private readonly Encoding m_encoding = Encoding.UTF8; | ||
89 | private readonly LLUUID m_agentId; | 87 | private readonly LLUUID m_agentId; |
90 | private readonly uint m_circuitCode; | 88 | private readonly uint m_circuitCode; |
91 | private int m_moneyBalance; | 89 | private int m_moneyBalance; |
@@ -3540,7 +3538,7 @@ namespace OpenSim.Region.ClientStack | |||
3540 | if (handlerObjectDescription != null) | 3538 | if (handlerObjectDescription != null) |
3541 | { | 3539 | { |
3542 | handlerObjectDescription(this, objDes.ObjectData[i].LocalID, | 3540 | handlerObjectDescription(this, objDes.ObjectData[i].LocalID, |
3543 | m_encoding.GetString(objDes.ObjectData[i].Description)); | 3541 | Util.FieldToString(objDes.ObjectData[i].Description)); |
3544 | } | 3542 | } |
3545 | } | 3543 | } |
3546 | break; | 3544 | break; |
@@ -3554,7 +3552,7 @@ namespace OpenSim.Region.ClientStack | |||
3554 | if (handlerObjectName != null) | 3552 | if (handlerObjectName != null) |
3555 | { | 3553 | { |
3556 | handlerObjectName(this, objName.ObjectData[i].LocalID, | 3554 | handlerObjectName(this, objName.ObjectData[i].LocalID, |
3557 | m_encoding.GetString(objName.ObjectData[i].Name)); | 3555 | Util.FieldToString(objName.ObjectData[i].Name)); |
3558 | } | 3556 | } |
3559 | } | 3557 | } |
3560 | break; | 3558 | break; |