diff options
author | John Hurliman | 2009-10-02 18:31:08 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-02 18:31:08 -0700 |
commit | 387e9f7a7faeb412054383080afc3507a1522746 (patch) | |
tree | 522470dd28074f7e114547476968942c05e866aa /OpenSim/Region/ScriptEngine/Shared/Api/Implementation | |
parent | Merge branch 'diva-textures-osgrid' of ssh://opensimulator.org/var/git/opensi... (diff) | |
download | opensim-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 '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 |
2 files changed, 2 insertions, 2 deletions
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 | |||
7064 | try | 7064 | try |
7065 | { | 7065 | { |
7066 | byte[] encData_byte = new byte[str.Length]; | 7066 | byte[] encData_byte = new byte[str.Length]; |
7067 | encData_byte = Encoding.UTF8.GetBytes(str); | 7067 | encData_byte = Util.UTF8.GetBytes(str); |
7068 | string encodedData = Convert.ToBase64String(encData_byte); | 7068 | string encodedData = Convert.ToBase64String(encData_byte); |
7069 | return encodedData; | 7069 | return encodedData; |
7070 | } | 7070 | } |
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 | |||
1457 | notecardData = "Linden text version 2\n{\nLLEmbeddedItems version 1\n{\ncount 0\n}\nText length " | 1457 | notecardData = "Linden text version 2\n{\nLLEmbeddedItems version 1\n{\ncount 0\n}\nText length " |
1458 | + textLength.ToString() + "\n" + notecardData + "}\n"; | 1458 | + textLength.ToString() + "\n" + notecardData + "}\n"; |
1459 | 1459 | ||
1460 | asset.Data = Encoding.UTF8.GetBytes(notecardData); | 1460 | asset.Data = Util.UTF8.GetBytes(notecardData); |
1461 | World.AssetService.Store(asset); | 1461 | World.AssetService.Store(asset); |
1462 | 1462 | ||
1463 | // Create Task Entry | 1463 | // Create Task Entry |