diff options
-rw-r--r-- | OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs (renamed from OpenSim/Region/CoreModules/World/Archiver/RegionSettingsSerializer.cs) | 7 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs | 1 | ||||
-rw-r--r-- | bin/OpenSim.ini.example | 8 |
4 files changed, 8 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/RegionSettingsSerializer.cs b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs index 799dcb9..3ee9e1b 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/RegionSettingsSerializer.cs +++ b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs | |||
@@ -31,16 +31,13 @@ using System.Xml; | |||
31 | using OpenMetaverse; | 31 | using OpenMetaverse; |
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | 33 | ||
34 | namespace OpenSim.Region.CoreModules.World.Archiver | 34 | namespace OpenSim.Framework.Serialization.External |
35 | { | 35 | { |
36 | /// <summary> | 36 | /// <summary> |
37 | /// Serialize and deserialize region settings for an archive file format. | 37 | /// Serialize and deserialize region settings for an archive file format. |
38 | /// </summary> | 38 | /// </summary> |
39 | /// We didn't simply use automatic .NET serializagion for OpenSim.Framework.RegionSettings since this is really | 39 | /// We didn't simply use automatic .NET serializagion for OpenSim.Framework.RegionSettings since this is really |
40 | /// a file format rather than an object serialization. | 40 | /// a file format rather than an object serialization. |
41 | /// TODO: However, we could still have used separate non-framework classes here to read and write the xml | ||
42 | /// automatically rather than laboriously doing it by hand using XmlTextReader and Writer. Should switch to this | ||
43 | /// in the future. | ||
44 | public class RegionSettingsSerializer | 41 | public class RegionSettingsSerializer |
45 | { | 42 | { |
46 | protected static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding(); | 43 | protected static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding(); |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index 8b603b4..3f6e822 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
@@ -36,6 +36,7 @@ using log4net; | |||
36 | using OpenMetaverse; | 36 | using OpenMetaverse; |
37 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
38 | using OpenSim.Framework.Serialization; | 38 | using OpenSim.Framework.Serialization; |
39 | using OpenSim.Framework.Serialization.External; | ||
39 | using OpenSim.Framework.Communications.Cache; | 40 | using OpenSim.Framework.Communications.Cache; |
40 | using OpenSim.Region.CoreModules.World.Terrain; | 41 | using OpenSim.Region.CoreModules.World.Terrain; |
41 | using OpenSim.Region.Framework.Interfaces; | 42 | using OpenSim.Region.Framework.Interfaces; |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs index db74564..85391b3 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs | |||
@@ -34,6 +34,7 @@ using log4net; | |||
34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Framework.Serialization; | 36 | using OpenSim.Framework.Serialization; |
37 | using OpenSim.Framework.Serialization.External; | ||
37 | using OpenSim.Region.CoreModules.World.Terrain; | 38 | using OpenSim.Region.CoreModules.World.Terrain; |
38 | using OpenSim.Region.Framework.Interfaces; | 39 | using OpenSim.Region.Framework.Interfaces; |
39 | using OpenSim.Region.Framework.Scenes; | 40 | using OpenSim.Region.Framework.Scenes; |
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index e4fcc9c..9f5932a 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -688,10 +688,10 @@ InterregionComms = "RESTComms" | |||
688 | 688 | ||
689 | 689 | ||
690 | [Wind] | 690 | [Wind] |
691 | ; Enables the wind module. Default is true | 691 | ; Enables the wind module. Default is true |
692 | enabled = true | 692 | enabled = true |
693 | ; Adjusts wind strength. 0.0 = no wind, 1.0 = normal wind. Default is 1.0 | 693 | ; Adjusts wind strength. 0.0 = no wind, 1.0 = normal wind. Default is 1.0 |
694 | strength = 1.0 | 694 | strength = 1.0 |
695 | 695 | ||
696 | 696 | ||
697 | [Trees] | 697 | [Trees] |