1 files changed, 102 insertions, 103 deletions

diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index c4557f8..8c25603 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -26,16 +26,11 @@
 * 
 */
 using System;
-using System.Globalization;
 using System.Net;
-using System.Xml;
 using System.Net.Sockets;
-using Nini.Config;
+using System.Xml;
 using libsecondlife;
-using OpenSim.Framework.Console;
-using OpenSim.Framework;
-
-
+using Nini.Config;
 
 namespace OpenSim.Framework
 {
@@ -64,6 +59,7 @@ namespace OpenSim.Framework
 
             m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int) port);
         }
+
         public SimpleRegionInfo(RegionInfo ConvertFrom)
         {
             m_regionLocX = ConvertFrom.RegionLocX;
@@ -78,16 +74,11 @@ namespace OpenSim.Framework
         public LLUUID RegionID = LLUUID.Zero;
 
         public uint m_remotingPort;
+
         public uint RemotingPort
         {
-            get
-            {
-                return m_remotingPort;
-            }
-            set
-            {
-                m_remotingPort = value;
-            }
+            get { return m_remotingPort; }
+            set { m_remotingPort = value; }
         }
 
         public string RemotingAddress;
@@ -123,73 +114,47 @@ namespace OpenSim.Framework
                 return new IPEndPoint(ia, m_internalEndPoint.Port);
             }
 
-            set
-            {
-                m_externalHostName = value.ToString();
-            }
+            set { m_externalHostName = value.ToString(); }
         }
 
         protected string m_externalHostName;
+
         public string ExternalHostName
         {
-            get
-            {
-                return m_externalHostName;
-            }
-            set
-            {
-                m_externalHostName = value;
-            }
+            get { return m_externalHostName; }
+            set { m_externalHostName = value; }
         }
 
         protected IPEndPoint m_internalEndPoint;
+
         public IPEndPoint InternalEndPoint
         {
-            get
-            {
-                return m_internalEndPoint;
-            }
-            set
-            {
-                m_internalEndPoint = value;
-            }
+            get { return m_internalEndPoint; }
+            set { m_internalEndPoint = value; }
         }
 
         protected uint? m_regionLocX;
+
         public uint RegionLocX
         {
-            get
-            {
-                return m_regionLocX.Value;
-            }
-            set
-            {
-                m_regionLocX = value;
-            }
+            get { return m_regionLocX.Value; }
+            set { m_regionLocX = value; }
         }
 
         protected uint? m_regionLocY;
+
         public uint RegionLocY
         {
-            get
-            {
-                return m_regionLocY.Value;
-            }
-            set
-            {
-                m_regionLocY = value;
-            }
+            get { return m_regionLocY.Value; }
+            set { m_regionLocY = value; }
         }
 
         public ulong RegionHandle
         {
-            get
-            {
-                return Util.UIntsToLong((RegionLocX * 256), (RegionLocY * 256));
-            }
+            get { return Util.UIntsToLong((RegionLocX*256), (RegionLocY*256)); }
         }
     }
-    
+
     public class RegionInfo : SimpleRegionInfo
     {
         public string RegionName = "";
@@ -206,15 +171,16 @@ namespace OpenSim.Framework
 
         // Apparently, we're applying the same estatesettings regardless of whether it's local or remote.
         private static EstateSettings m_estateSettings;
+
         public EstateSettings EstateSettings
         {
             get
             {
-                if( m_estateSettings == null )
+                if (m_estateSettings == null)
                 {
                     m_estateSettings = new EstateSettings();
                 }
-                
+
                 return m_estateSettings;
             }
         }
@@ -223,14 +189,18 @@ namespace OpenSim.Framework
 
         public RegionInfo(string description, string filename)
         {
-            configMember = new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration);
+            configMember =
+                new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration);
             configMember.performConfigurationRetrieve();
         }
+
         public RegionInfo(string description, XmlNode xmlNode)
         {
-            configMember = new ConfigurationMember(xmlNode, description, loadConfigurationOptions, handleIncomingConfiguration);
+            configMember =
+                new ConfigurationMember(xmlNode, description, loadConfigurationOptions, handleIncomingConfiguration);
             configMember.performConfigurationRetrieve();
         }
+
         public RegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) :
             base(regionLocX, regionLocY, internalEndPoint, externalUri)
         {
@@ -239,6 +209,7 @@ namespace OpenSim.Framework
         public RegionInfo()
         {
         }
+
         public RegionInfo(SearializableRegionInfo ConvertFrom)
         {
             m_regionLocX = ConvertFrom.RegionLocX;
@@ -249,6 +220,7 @@ namespace OpenSim.Framework
             RemotingAddress = ConvertFrom.RemotingAddress;
             RegionID = LLUUID.Zero;
         }
+
         public RegionInfo(SimpleRegionInfo ConvertFrom)
         {
             m_regionLocX = ConvertFrom.RegionLocX;
@@ -259,47 +231,49 @@ namespace OpenSim.Framework
             RemotingAddress = ConvertFrom.RemotingAddress;
             RegionID = LLUUID.Zero;
         }
+
         //not in use, should swap to nini though.
         public void LoadFromNiniSource(IConfigSource source)
         {
-            this.LoadFromNiniSource(source, "RegionInfo");
+            LoadFromNiniSource(source, "RegionInfo");
         }
 
         //not in use, should swap to nini though.
         public void LoadFromNiniSource(IConfigSource source, string sectionName)
         {
             string errorMessage = "";
-            this.RegionID = new LLUUID(source.Configs[sectionName].GetString("Region_ID", LLUUID.Random().ToString()));
-            this.RegionName = source.Configs[sectionName].GetString("sim_name", "OpenSim Test");
-            this.m_regionLocX = Convert.ToUInt32(source.Configs[sectionName].GetString("sim_location_x", "1000"));
-            this.m_regionLocY = Convert.ToUInt32(source.Configs[sectionName].GetString("sim_location_y", "1000"));
+            RegionID = new LLUUID(source.Configs[sectionName].GetString("Region_ID", LLUUID.Random().ToString()));
+            RegionName = source.Configs[sectionName].GetString("sim_name", "OpenSim Test");
+            m_regionLocX = Convert.ToUInt32(source.Configs[sectionName].GetString("sim_location_x", "1000"));
+            m_regionLocY = Convert.ToUInt32(source.Configs[sectionName].GetString("sim_location_y", "1000"));
             // this.DataStore = source.Configs[sectionName].GetString("datastore", "OpenSim.db");
 
             string ipAddress = source.Configs[sectionName].GetString("internal_ip_address", "0.0.0.0");
             IPAddress ipAddressResult;
             if (IPAddress.TryParse(ipAddress, out ipAddressResult))
             {
-                this.m_internalEndPoint = new IPEndPoint(ipAddressResult, 0);
+                m_internalEndPoint = new IPEndPoint(ipAddressResult, 0);
             }
             else
             {
                 errorMessage = "needs an IP Address (IPAddress)";
             }
-            this.m_internalEndPoint.Port = source.Configs[sectionName].GetInt("internal_ip_port", (int) NetworkServersInfo.DefaultHttpListenerPort);
+            m_internalEndPoint.Port =
+                source.Configs[sectionName].GetInt("internal_ip_port", (int) NetworkServersInfo.DefaultHttpListenerPort);
 
             string externalHost = source.Configs[sectionName].GetString("external_host_name", "127.0.0.1");
             if (externalHost != "SYSTEMIP")
             {
-                this.m_externalHostName = externalHost;
+                m_externalHostName = externalHost;
             }
             else
             {
-                this.m_externalHostName = Util.GetLocalHost().ToString();
+                m_externalHostName = Util.GetLocalHost().ToString();
             }
 
-            this.MasterAvatarFirstName = source.Configs[sectionName].GetString("master_avatar_first", "Test");
-            this.MasterAvatarLastName = source.Configs[sectionName].GetString("master_avatar_last", "User");
-            this.MasterAvatarSandboxPassword = source.Configs[sectionName].GetString("master_avatar_pass", "test");
+            MasterAvatarFirstName = source.Configs[sectionName].GetString("master_avatar_first", "Test");
+            MasterAvatarLastName = source.Configs[sectionName].GetString("master_avatar_last", "User");
+            MasterAvatarSandboxPassword = source.Configs[sectionName].GetString("master_avatar_pass", "test");
 
             if (errorMessage != "")
             {
@@ -309,19 +283,45 @@ namespace OpenSim.Framework
 
         public void loadConfigurationOptions()
         {
-            configMember.addConfigurationOption("sim_UUID", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "UUID of Region (Default is recommended, random UUID)", LLUUID.Random().ToString(), true);
-            configMember.addConfigurationOption("sim_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Region Name", "OpenSim Test", false);
-            configMember.addConfigurationOption("sim_location_x", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Grid Location (X Axis)", "1000", false);
-            configMember.addConfigurationOption("sim_location_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Grid Location (Y Axis)", "1000", false);
+            configMember.addConfigurationOption("sim_UUID", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
+                                                "UUID of Region (Default is recommended, random UUID)",
+                                                LLUUID.Random().ToString(), true);
+            configMember.addConfigurationOption("sim_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
+                                                "Region Name", "OpenSim Test", false);
+            configMember.addConfigurationOption("sim_location_x", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
+                                                "Grid Location (X Axis)", "1000", false);
+            configMember.addConfigurationOption("sim_location_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
+                                                "Grid Location (Y Axis)", "1000", false);
             //configMember.addConfigurationOption("datastore", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Filename for local storage", "OpenSim.db", false);
-            configMember.addConfigurationOption("internal_ip_address", ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS, "Internal IP Address for incoming UDP client connections", "0.0.0.0", false);
-            configMember.addConfigurationOption("internal_ip_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "Internal IP Port for incoming UDP client connections", NetworkServersInfo.DefaultHttpListenerPort.ToString(), false);
-            configMember.addConfigurationOption("external_host_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "External Host Name", "127.0.0.1", false);
-            configMember.addConfigurationOption("master_avatar_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "Master Avatar UUID", LLUUID.Zero.ToString(), true);
-            configMember.addConfigurationOption("estate_covanant_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "Estate Covenant", LLUUID.Zero.ToString(), true);
-            configMember.addConfigurationOption("master_avatar_first", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "First Name of Master Avatar", "Test", false,(ConfigurationOption.ConfigurationOptionShouldBeAsked)shouldMasterAvatarDetailsBeAsked);
-            configMember.addConfigurationOption("master_avatar_last", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Last Name of Master Avatar", "User", false, (ConfigurationOption.ConfigurationOptionShouldBeAsked)shouldMasterAvatarDetailsBeAsked);
-            configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "(Sandbox Mode Only)Password for Master Avatar account", "test", false, (ConfigurationOption.ConfigurationOptionShouldBeAsked)shouldMasterAvatarDetailsBeAsked);
+            configMember.addConfigurationOption("internal_ip_address",
+                                                ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS,
+                                                "Internal IP Address for incoming UDP client connections", "0.0.0.0",
+                                                false);
+            configMember.addConfigurationOption("internal_ip_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
+                                                "Internal IP Port for incoming UDP client connections",
+                                                NetworkServersInfo.DefaultHttpListenerPort.ToString(), false);
+            configMember.addConfigurationOption("external_host_name",
+                                                ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
+                                                "External Host Name", "127.0.0.1", false);
+            configMember.addConfigurationOption("master_avatar_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
+                                                "Master Avatar UUID", LLUUID.Zero.ToString(), true);
+            configMember.addConfigurationOption("estate_covanant_uuid",
+                                                ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "Estate Covenant",
+                                                LLUUID.Zero.ToString(), true);
+            configMember.addConfigurationOption("master_avatar_first",
+                                                ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
+                                                "First Name of Master Avatar", "Test", false,
+                                                (ConfigurationOption.ConfigurationOptionShouldBeAsked)
+                                                shouldMasterAvatarDetailsBeAsked);
+            configMember.addConfigurationOption("master_avatar_last",
+                                                ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
+                                                "Last Name of Master Avatar", "User", false,
+                                                (ConfigurationOption.ConfigurationOptionShouldBeAsked)
+                                                shouldMasterAvatarDetailsBeAsked);
+            configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
+                                                "(Sandbox Mode Only)Password for Master Avatar account", "test", false,
+                                                (ConfigurationOption.ConfigurationOptionShouldBeAsked)
+                                                shouldMasterAvatarDetailsBeAsked);
         }
 
         public bool shouldMasterAvatarDetailsBeAsked(string configuration_key)
@@ -338,58 +338,57 @@ namespace OpenSim.Framework
             switch (configuration_key)
             {
                 case "sim_UUID":
-                    this.RegionID = (LLUUID)configuration_result;
+                    RegionID = (LLUUID) configuration_result;
                     break;
                 case "sim_name":
-                    this.RegionName = (string)configuration_result;
+                    RegionName = (string) configuration_result;
                     break;
                 case "sim_location_x":
-                    this.m_regionLocX = (uint)configuration_result;
+                    m_regionLocX = (uint) configuration_result;
                     break;
                 case "sim_location_y":
-                    this.m_regionLocY = (uint)configuration_result;
+                    m_regionLocY = (uint) configuration_result;
                     break;
                 case "datastore":
-                    this.DataStore = (string)configuration_result;
+                    DataStore = (string) configuration_result;
                     break;
                 case "internal_ip_address":
-                    IPAddress address = (IPAddress)configuration_result;
-                    this.m_internalEndPoint = new IPEndPoint(address, 0);
+                    IPAddress address = (IPAddress) configuration_result;
+                    m_internalEndPoint = new IPEndPoint(address, 0);
                     break;
                 case "internal_ip_port":
-                    this.m_internalEndPoint.Port = (int)configuration_result;
+                    m_internalEndPoint.Port = (int) configuration_result;
                     break;
                 case "external_host_name":
-                    if ((string)configuration_result != "SYSTEMIP")
+                    if ((string) configuration_result != "SYSTEMIP")
                     {
-                        this.m_externalHostName = (string)configuration_result;
+                        m_externalHostName = (string) configuration_result;
                     }
                     else
                     {
-                        this.m_externalHostName = Util.GetLocalHost().ToString();
+                        m_externalHostName = Util.GetLocalHost().ToString();
                     }
                     break;
                 case "master_avatar_uuid":
-                    this.MasterAvatarAssignedUUID = (LLUUID)configuration_result;
+                    MasterAvatarAssignedUUID = (LLUUID) configuration_result;
                     break;
                 case "estate_covanant_uuid":
-                    this.CovenantID = (LLUUID)configuration_result;
+                    CovenantID = (LLUUID) configuration_result;
                     break;
 
                 case "master_avatar_first":
-                    this.MasterAvatarFirstName = (string)configuration_result;
+                    MasterAvatarFirstName = (string) configuration_result;
                     break;
                 case "master_avatar_last":
-                    this.MasterAvatarLastName = (string)configuration_result;
+                    MasterAvatarLastName = (string) configuration_result;
                     break;
                 case "master_avatar_pass":
-                    string tempMD5Passwd = (string)configuration_result;
-                    this.MasterAvatarSandboxPassword = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + "");
+                    string tempMD5Passwd = (string) configuration_result;
+                    MasterAvatarSandboxPassword = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + "");
                     break;
             }
 
             return true;
         }
-
     }
-}
+}
\ No newline at end of file