From 387e9f7a7faeb412054383080afc3507a1522746 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Fri, 2 Oct 2009 18:31:08 -0700
Subject: * 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?

---
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs  | 2 +-
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine')

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index ba42678..264d585 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -7064,7 +7064,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             try
             {
                 byte[] encData_byte = new byte[str.Length];
-                encData_byte = Encoding.UTF8.GetBytes(str);
+                encData_byte = Util.UTF8.GetBytes(str);
                 string encodedData = Convert.ToBase64String(encData_byte);
                 return encodedData;
             }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 726b37a..f80dd51 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -1457,7 +1457,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             notecardData = "Linden text version 2\n{\nLLEmbeddedItems version 1\n{\ncount 0\n}\nText length "
             + textLength.ToString() + "\n" + notecardData + "}\n";
 
-            asset.Data = Encoding.UTF8.GetBytes(notecardData);
+            asset.Data = Util.UTF8.GetBytes(notecardData);
             World.AssetService.Store(asset);
 
             // Create Task Entry
-- 
cgit v1.1