diff options
| author | Melanie | 2012-07-12 08:55:16 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-12 08:55:16 +0100 |
| commit | d632fd7124e3962534fc34f9c7749615dbb62108 (patch) | |
| tree | 84ece06822680bfd5b639d9c3fd046ecbb7a154e /OpenSim/Framework/Util.cs | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Many explanitory comments added to the link and delink code in (diff) | |
| download | opensim-SC_OLD-d632fd7124e3962534fc34f9c7749615dbb62108.zip opensim-SC_OLD-d632fd7124e3962534fc34f9c7749615dbb62108.tar.gz opensim-SC_OLD-d632fd7124e3962534fc34f9c7749615dbb62108.tar.bz2 opensim-SC_OLD-d632fd7124e3962534fc34f9c7749615dbb62108.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
Diffstat (limited to 'OpenSim/Framework/Util.cs')
| -rw-r--r-- | OpenSim/Framework/Util.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 728cda0..30bbfd4 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
| @@ -1248,8 +1248,7 @@ namespace OpenSim.Framework | |||
| 1248 | 1248 | ||
| 1249 | public static string Base64ToString(string str) | 1249 | public static string Base64ToString(string str) |
| 1250 | { | 1250 | { |
| 1251 | UTF8Encoding encoder = new UTF8Encoding(); | 1251 | Decoder utf8Decode = Encoding.UTF8.GetDecoder(); |
| 1252 | Decoder utf8Decode = encoder.GetDecoder(); | ||
| 1253 | 1252 | ||
| 1254 | byte[] todecode_byte = Convert.FromBase64String(str); | 1253 | byte[] todecode_byte = Convert.FromBase64String(str); |
| 1255 | int charCount = utf8Decode.GetCharCount(todecode_byte, 0, todecode_byte.Length); | 1254 | int charCount = utf8Decode.GetCharCount(todecode_byte, 0, todecode_byte.Length); |