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/ApplicationPlugins/Rest | |
parent | Merge branch 'master' into vehicles (diff) | |
parent | Make the asset connector async Get overload return false if the asset (diff) | |
download | opensim-SC_OLD-0744292b479446eb1ebec828afafacc0189709ca.zip opensim-SC_OLD-0744292b479446eb1ebec828afafacc0189709ca.tar.gz opensim-SC_OLD-0744292b479446eb1ebec828afafacc0189709ca.tar.bz2 opensim-SC_OLD-0744292b479446eb1ebec828afafacc0189709ca.tar.xz |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/ApplicationPlugins/Rest')
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs | 4 | ||||
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/RestXmlWriter.cs | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs index 1e3539f..7db705e 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs | |||
@@ -163,7 +163,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
163 | get { return Plugin.RequestId; } | 163 | get { return Plugin.RequestId; } |
164 | } | 164 | } |
165 | 165 | ||
166 | internal static Encoding Encoding = Encoding.UTF8; | 166 | internal static Encoding Encoding = Util.UTF8; |
167 | 167 | ||
168 | /// <summary> | 168 | /// <summary> |
169 | /// Version control for REST implementation. This | 169 | /// Version control for REST implementation. This |
@@ -435,7 +435,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
435 | try | 435 | try |
436 | { | 436 | { |
437 | byte[] encData_byte = new byte[str.Length]; | 437 | byte[] encData_byte = new byte[str.Length]; |
438 | encData_byte = Encoding.UTF8.GetBytes(str); | 438 | encData_byte = Util.UTF8.GetBytes(str); |
439 | return Convert.ToBase64String(encData_byte); | 439 | return Convert.ToBase64String(encData_byte); |
440 | } | 440 | } |
441 | catch | 441 | catch |
diff --git a/OpenSim/ApplicationPlugins/Rest/RestXmlWriter.cs b/OpenSim/ApplicationPlugins/Rest/RestXmlWriter.cs index 9abb0c8..283fa2e 100644 --- a/OpenSim/ApplicationPlugins/Rest/RestXmlWriter.cs +++ b/OpenSim/ApplicationPlugins/Rest/RestXmlWriter.cs | |||
@@ -45,7 +45,8 @@ namespace OpenSim.ApplicationPlugins.Rest | |||
45 | { | 45 | { |
46 | } | 46 | } |
47 | 47 | ||
48 | public RestXmlWriter(Stream stream) : this(stream, Encoding.UTF8) | 48 | public RestXmlWriter(Stream stream) |
49 | : this(stream, Encoding.UTF8) | ||
49 | { | 50 | { |
50 | } | 51 | } |
51 | 52 | ||