aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs
diff options
context:
space:
mode:
authorMelanie2009-10-04 05:49:16 +0100
committerMelanie2009-10-04 05:49:16 +0100
commit6878b26b0d3d9ba26b1afe097e193fb1bafbc9b6 (patch)
tree7e786c0ce436f42a60806629f3249658eab4884a /OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs
parentSlightly better message with status code for WebException. (diff)
parentClosing another stream. (diff)
downloadopensim-SC-6878b26b0d3d9ba26b1afe097e193fb1bafbc9b6.zip
opensim-SC-6878b26b0d3d9ba26b1afe097e193fb1bafbc9b6.tar.gz
opensim-SC-6878b26b0d3d9ba26b1afe097e193fb1bafbc9b6.tar.bz2
opensim-SC-6878b26b0d3d9ba26b1afe097e193fb1bafbc9b6.tar.xz
Merge branch 'diva-textures-osgrid'
Diffstat (limited to 'OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs')
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs4
1 files changed, 2 insertions, 2 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