diff options
| author | John Hurliman | 2009-09-30 15:28:23 -0700 |
|---|---|---|
| committer | John Hurliman | 2009-09-30 15:28:23 -0700 |
| commit | acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009 (patch) | |
| tree | 305349e1bd0a5849fd7f96483e24d5e07b24b8f4 /OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs | |
| parent | * Adding Scale to EntityBase * Fixing the incorrect initialization of EntityB... (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.zip opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.gz opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.bz2 opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs')
| -rw-r--r-- | OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs index 274f41f..b5901e1 100644 --- a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs +++ b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs | |||
| @@ -158,7 +158,7 @@ namespace OpenSim.Framework.Serialization.External | |||
| 158 | settings.Elevation2NE = double.Parse(xtr.ReadElementContentAsString()); | 158 | settings.Elevation2NE = double.Parse(xtr.ReadElementContentAsString()); |
| 159 | break; | 159 | break; |
| 160 | } | 160 | } |
| 161 | } | 161 | } |
| 162 | 162 | ||
| 163 | xtr.ReadEndElement(); | 163 | xtr.ReadEndElement(); |
| 164 | xtr.ReadStartElement("Terrain"); | 164 | xtr.ReadStartElement("Terrain"); |
| @@ -200,8 +200,8 @@ namespace OpenSim.Framework.Serialization.External | |||
| 200 | 200 | ||
| 201 | xtw.WriteStartElement("RegionSettings"); | 201 | xtw.WriteStartElement("RegionSettings"); |
| 202 | 202 | ||
| 203 | xtw.WriteStartElement("General"); | 203 | xtw.WriteStartElement("General"); |
| 204 | xtw.WriteElementString("AllowDamage", settings.AllowDamage.ToString()); | 204 | xtw.WriteElementString("AllowDamage", settings.AllowDamage.ToString()); |
| 205 | xtw.WriteElementString("AllowLandResell", settings.AllowLandResell.ToString()); | 205 | xtw.WriteElementString("AllowLandResell", settings.AllowLandResell.ToString()); |
| 206 | xtw.WriteElementString("AllowLandJoinDivide", settings.AllowLandJoinDivide.ToString()); | 206 | xtw.WriteElementString("AllowLandJoinDivide", settings.AllowLandJoinDivide.ToString()); |
| 207 | xtw.WriteElementString("BlockFly", settings.BlockFly.ToString()); | 207 | xtw.WriteElementString("BlockFly", settings.BlockFly.ToString()); |