diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs index 19468c3..fd21f3e 100644 --- a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs +++ b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs | |||
@@ -50,7 +50,7 @@ namespace OpenSim.Framework.Serialization.External | |||
50 | { | 50 | { |
51 | return Deserialize(Encoding.ASCII.GetString(serializedSettings, 0, serializedSettings.Length)); | 51 | return Deserialize(Encoding.ASCII.GetString(serializedSettings, 0, serializedSettings.Length)); |
52 | } | 52 | } |
53 | 53 | ||
54 | /// <summary> | 54 | /// <summary> |
55 | /// Deserialize settings | 55 | /// Deserialize settings |
56 | /// </summary> | 56 | /// </summary> |
@@ -60,14 +60,15 @@ namespace OpenSim.Framework.Serialization.External | |||
60 | public static RegionSettings Deserialize(string serializedSettings) | 60 | public static RegionSettings Deserialize(string serializedSettings) |
61 | { | 61 | { |
62 | RegionSettings settings = new RegionSettings(); | 62 | RegionSettings settings = new RegionSettings(); |
63 | 63 | ||
64 | StringReader sr = new StringReader(serializedSettings); | 64 | StringReader sr = new StringReader(serializedSettings); |
65 | XmlTextReader xtr = new XmlTextReader(sr); | 65 | XmlTextReader xtr = new XmlTextReader(sr); |
66 | 66 | xtr.ProhibitDtd = true; | |
67 | |||
67 | xtr.ReadStartElement("RegionSettings"); | 68 | xtr.ReadStartElement("RegionSettings"); |
68 | 69 | ||
69 | xtr.ReadStartElement("General"); | 70 | xtr.ReadStartElement("General"); |
70 | 71 | ||
71 | while (xtr.Read() && xtr.NodeType != XmlNodeType.EndElement) | 72 | while (xtr.Read() && xtr.NodeType != XmlNodeType.EndElement) |
72 | { | 73 | { |
73 | switch (xtr.Name) | 74 | switch (xtr.Name) |
@@ -113,10 +114,10 @@ namespace OpenSim.Framework.Serialization.External | |||
113 | break; | 114 | break; |
114 | } | 115 | } |
115 | } | 116 | } |
116 | 117 | ||
117 | xtr.ReadEndElement(); | 118 | xtr.ReadEndElement(); |
118 | xtr.ReadStartElement("GroundTextures"); | 119 | xtr.ReadStartElement("GroundTextures"); |
119 | 120 | ||
120 | while (xtr.Read() && xtr.NodeType != XmlNodeType.EndElement) | 121 | while (xtr.Read() && xtr.NodeType != XmlNodeType.EndElement) |
121 | { | 122 | { |
122 | switch (xtr.Name) | 123 | switch (xtr.Name) |
@@ -159,10 +160,10 @@ namespace OpenSim.Framework.Serialization.External | |||
159 | break; | 160 | break; |
160 | } | 161 | } |
161 | } | 162 | } |
162 | 163 | ||
163 | xtr.ReadEndElement(); | 164 | xtr.ReadEndElement(); |
164 | xtr.ReadStartElement("Terrain"); | 165 | xtr.ReadStartElement("Terrain"); |
165 | 166 | ||
166 | while (xtr.Read() && xtr.NodeType != XmlNodeType.EndElement) | 167 | while (xtr.Read() && xtr.NodeType != XmlNodeType.EndElement) |
167 | { | 168 | { |
168 | switch (xtr.Name) | 169 | switch (xtr.Name) |
@@ -212,19 +213,19 @@ namespace OpenSim.Framework.Serialization.External | |||
212 | 213 | ||
213 | xtr.Close(); | 214 | xtr.Close(); |
214 | sr.Close(); | 215 | sr.Close(); |
215 | 216 | ||
216 | return settings; | 217 | return settings; |
217 | } | 218 | } |
218 | 219 | ||
219 | public static string Serialize(RegionSettings settings) | 220 | public static string Serialize(RegionSettings settings) |
220 | { | 221 | { |
221 | StringWriter sw = new StringWriter(); | 222 | StringWriter sw = new StringWriter(); |
222 | XmlTextWriter xtw = new XmlTextWriter(sw); | 223 | XmlTextWriter xtw = new XmlTextWriter(sw); |
223 | xtw.Formatting = Formatting.Indented; | 224 | xtw.Formatting = Formatting.Indented; |
224 | xtw.WriteStartDocument(); | 225 | xtw.WriteStartDocument(); |
225 | 226 | ||
226 | xtw.WriteStartElement("RegionSettings"); | 227 | xtw.WriteStartElement("RegionSettings"); |
227 | 228 | ||
228 | xtw.WriteStartElement("General"); | 229 | xtw.WriteStartElement("General"); |
229 | xtw.WriteElementString("AllowDamage", settings.AllowDamage.ToString()); | 230 | xtw.WriteElementString("AllowDamage", settings.AllowDamage.ToString()); |
230 | xtw.WriteElementString("AllowLandResell", settings.AllowLandResell.ToString()); | 231 | xtw.WriteElementString("AllowLandResell", settings.AllowLandResell.ToString()); |
@@ -255,7 +256,7 @@ namespace OpenSim.Framework.Serialization.External | |||
255 | xtw.WriteElementString("ElevationHighSE", settings.Elevation2SE.ToString()); | 256 | xtw.WriteElementString("ElevationHighSE", settings.Elevation2SE.ToString()); |
256 | xtw.WriteElementString("ElevationHighNE", settings.Elevation2NE.ToString()); | 257 | xtw.WriteElementString("ElevationHighNE", settings.Elevation2NE.ToString()); |
257 | xtw.WriteEndElement(); | 258 | xtw.WriteEndElement(); |
258 | 259 | ||
259 | xtw.WriteStartElement("Terrain"); | 260 | xtw.WriteStartElement("Terrain"); |
260 | xtw.WriteElementString("WaterHeight", settings.WaterHeight.ToString()); | 261 | xtw.WriteElementString("WaterHeight", settings.WaterHeight.ToString()); |
261 | xtw.WriteElementString("TerrainRaiseLimit", settings.TerrainRaiseLimit.ToString()); | 262 | xtw.WriteElementString("TerrainRaiseLimit", settings.TerrainRaiseLimit.ToString()); |
@@ -275,12 +276,12 @@ namespace OpenSim.Framework.Serialization.External | |||
275 | xtw.WriteElementString("SpawnPoint", sp.ToString()); | 276 | xtw.WriteElementString("SpawnPoint", sp.ToString()); |
276 | } | 277 | } |
277 | xtw.WriteEndElement(); | 278 | xtw.WriteEndElement(); |
278 | 279 | ||
279 | xtw.WriteEndElement(); | 280 | xtw.WriteEndElement(); |
280 | 281 | ||
281 | xtw.Close(); | 282 | xtw.Close(); |
282 | sw.Close(); | 283 | sw.Close(); |
283 | 284 | ||
284 | return sw.ToString(); | 285 | return sw.ToString(); |
285 | } | 286 | } |
286 | } | 287 | } |