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/OptionalModules/World | |
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/OptionalModules/World/TreePopulator/TreePopulatorModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs index d4bba10..b6021a9 100644 --- a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs +++ b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs | |||
@@ -539,7 +539,7 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator | |||
539 | { | 539 | { |
540 | XmlSerializer xs = new XmlSerializer(typeof(Copse)); | 540 | XmlSerializer xs = new XmlSerializer(typeof(Copse)); |
541 | 541 | ||
542 | using (XmlTextWriter writer = new XmlTextWriter(fileName, System.Text.Encoding.UTF8)) | 542 | using (XmlTextWriter writer = new XmlTextWriter(fileName, Util.UTF8)) |
543 | { | 543 | { |
544 | writer.Formatting = Formatting.Indented; | 544 | writer.Formatting = Formatting.Indented; |
545 | xs.Serialize(writer, obj); | 545 | xs.Serialize(writer, obj); |