aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/Rest/Inventory
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-02 18:31:08 -0700
committerJohn Hurliman2009-10-02 18:31:08 -0700
commit387e9f7a7faeb412054383080afc3507a1522746 (patch)
tree522470dd28074f7e114547476968942c05e866aa /OpenSim/ApplicationPlugins/Rest/Inventory
parentMerge branch 'diva-textures-osgrid' of ssh://opensimulator.org/var/git/opensi... (diff)
downloadopensim-SC_OLD-387e9f7a7faeb412054383080afc3507a1522746.zip
opensim-SC_OLD-387e9f7a7faeb412054383080afc3507a1522746.tar.gz
opensim-SC_OLD-387e9f7a7faeb412054383080afc3507a1522746.tar.bz2
opensim-SC_OLD-387e9f7a7faeb412054383080afc3507a1522746.tar.xz
* Creates Util.UTF8 and switches some references of Encoding.UTF8 to Util.UTF8 (not all references were switched since not all OpenSim libraries reference OpenSim.Framework)
* Shrinks the largest in-memory object, the LLRAW.HeightmapLookupValue struct (only used for exporting to LLRAW terrain files), to the minimum possible size. This seems to have the odd side effect of cutting the size of the two double[256,256] terrain objects in half. Possibly an alignment optimization?
Diffstat (limited to 'OpenSim/ApplicationPlugins/Rest/Inventory')
-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