Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim

3 files changed, 6 insertions, 6 deletions

diff --git a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
index 6bfae41..4376249 100644
--- a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
@@ -155,7 +155,7 @@ namespace OpenSim.Framework.Serialization.External
             xtw.WriteElementString("OwnerID", landData.OwnerID.ToString());
 
             xtw.WriteStartElement("ParcelAccessList");
-            foreach(ParcelManager.ParcelAccessEntry pal in landData.ParcelAccessList)
+            foreach (ParcelManager.ParcelAccessEntry pal in landData.ParcelAccessList)
             {
                 xtw.WriteStartElement("ParcelAccessEntry");
                 xtw.WriteElementString("AgentID", pal.AgentID.ToString());
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
                         settings.Elevation2NE = double.Parse(xtr.ReadElementContentAsString());
                         break;
                 }
-            }                    
+            }
            
             xtr.ReadEndElement();
             xtr.ReadStartElement("Terrain");
@@ -200,8 +200,8 @@ namespace OpenSim.Framework.Serialization.External
             
             xtw.WriteStartElement("RegionSettings");
             
-            xtw.WriteStartElement("General");            
-            xtw.WriteElementString("AllowDamage", settings.AllowDamage.ToString());            
+            xtw.WriteStartElement("General");
+            xtw.WriteElementString("AllowDamage", settings.AllowDamage.ToString());
             xtw.WriteElementString("AllowLandResell", settings.AllowLandResell.ToString());
             xtw.WriteElementString("AllowLandJoinDivide", settings.AllowLandJoinDivide.ToString());
             xtw.WriteElementString("BlockFly", settings.BlockFly.ToString());
diff --git a/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs b/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs
index eb77e65..fb269b7 100644
--- a/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs
@@ -36,7 +36,7 @@ namespace OpenSim.Framework.Serialization.External
     /// Serialize and deserialize region settings as an external format.
     /// </summary>
     public class UserProfileSerializer
-    {    
+    {
         public const int MAJOR_VERSION = 0;
         public const int MINOR_VERSION = 1;
         
@@ -65,6 +65,6 @@ namespace OpenSim.Framework.Serialization.External
             sw.Close();
             
             return sw.ToString();
-        }        
+        }
     }
 }
\ No newline at end of file