aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-03-27 18:13:34 +0000
committerJustin Clarke Casey2009-03-27 18:13:34 +0000
commit561f24156476041bdcd2ef2fdccd296a4127d0b0 (patch)
treed06fa3bbff0f6755ff022d4d761ec1acda25b48c
parent* Also temporarily disable T032_CrossAttachments() since this relies on the e... (diff)
downloadopensim-SC_OLD-561f24156476041bdcd2ef2fdccd296a4127d0b0.zip
opensim-SC_OLD-561f24156476041bdcd2ef2fdccd296a4127d0b0.tar.gz
opensim-SC_OLD-561f24156476041bdcd2ef2fdccd296a4127d0b0.tar.bz2
opensim-SC_OLD-561f24156476041bdcd2ef2fdccd296a4127d0b0.tar.xz
* minor: move RegionSettingsSerializer into OpenSim.Framework.Serialization
-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.cs1
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs1
-rw-r--r--bin/OpenSim.ini.example8
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;
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenSim.Framework; 32using OpenSim.Framework;
33 33
34namespace OpenSim.Region.CoreModules.World.Archiver 34namespace 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;
36using OpenMetaverse; 36using OpenMetaverse;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Serialization; 38using OpenSim.Framework.Serialization;
39using OpenSim.Framework.Serialization.External;
39using OpenSim.Framework.Communications.Cache; 40using OpenSim.Framework.Communications.Cache;
40using OpenSim.Region.CoreModules.World.Terrain; 41using OpenSim.Region.CoreModules.World.Terrain;
41using OpenSim.Region.Framework.Interfaces; 42using 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;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Serialization; 36using OpenSim.Framework.Serialization;
37using OpenSim.Framework.Serialization.External;
37using OpenSim.Region.CoreModules.World.Terrain; 38using OpenSim.Region.CoreModules.World.Terrain;
38using OpenSim.Region.Framework.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Framework.Scenes; 40using 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]