diff options
| author | Melanie | 2009-10-05 10:17:23 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-05 10:17:23 +0100 |
| commit | 0744292b479446eb1ebec828afafacc0189709ca (patch) | |
| tree | 3c43b5f425aff61d3625b75b7aef35ce5062ae56 /OpenSim/Framework/Configuration | |
| parent | Merge branch 'master' into vehicles (diff) | |
| parent | Make the asset connector async Get overload return false if the asset (diff) | |
| download | opensim-SC-0744292b479446eb1ebec828afafacc0189709ca.zip opensim-SC-0744292b479446eb1ebec828afafacc0189709ca.tar.gz opensim-SC-0744292b479446eb1ebec828afafacc0189709ca.tar.bz2 opensim-SC-0744292b479446eb1ebec828afafacc0189709ca.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Framework/Configuration')
| -rw-r--r-- | OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs index 318d2c3..3dce578 100644 --- a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs +++ b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs | |||
| @@ -77,7 +77,7 @@ namespace OpenSim.Framework.Configuration.HTTP | |||
| 77 | count = resStream.Read(buf, 0, buf.Length); | 77 | count = resStream.Read(buf, 0, buf.Length); |
| 78 | if (count != 0) | 78 | if (count != 0) |
| 79 | { | 79 | { |
| 80 | tempString = Encoding.UTF8.GetString(buf, 0, count); | 80 | tempString = Util.UTF8.GetString(buf, 0, count); |
| 81 | sb.Append(tempString); | 81 | sb.Append(tempString); |
| 82 | } | 82 | } |
| 83 | } while (count > 0); | 83 | } while (count > 0); |