2 files changed, 0 insertions, 26 deletions

diff --git a/OpenSim/Framework/ConfigSettings.cs b/OpenSim/Framework/ConfigSettings.cs
index 32415e0..8feaa37 100644
--- a/OpenSim/Framework/ConfigSettings.cs
+++ b/OpenSim/Framework/ConfigSettings.cs
@@ -44,14 +44,6 @@ namespace OpenSim.Framework
             set { m_meshEngineName = value; }
         }
 
-        private bool m_standalone;
-
-        public bool Standalone
-        {
-            get { return m_standalone; }
-            set { m_standalone = value; }
-        }
-
         private bool m_see_into_region_from_neighbor;
 
         public bool See_into_region_from_neighbor
@@ -163,7 +155,6 @@ namespace OpenSim.Framework
 
         public const uint DefaultAssetServerHttpPort = 8003;
         public const uint DefaultRegionHttpPort = 9000;
-        public static uint DefaultRegionRemotingPort = 8895; // This is actually assigned to, but then again, the remoting is obsolete, right?
         public const uint DefaultUserServerHttpPort = 8002;
         public const bool DefaultUserServerHttpSSL = false;
         public const uint DefaultMessageServerHttpPort = 8006;
diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index f720222..b25f8b9 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -42,8 +42,6 @@ namespace OpenSim.Framework
         public string InventoryURL = String.Empty;
         public bool secureInventoryServer = false;
         public bool isSandbox;
-        private uint? m_defaultHomeLocX;
-        private uint? m_defaultHomeLocY;
         public string UserRecvKey = String.Empty;
         public string UserSendKey = String.Empty;
         public string UserURL = String.Empty;
@@ -59,24 +57,11 @@ namespace OpenSim.Framework
 
         public NetworkServersInfo(uint defaultHomeLocX, uint defaultHomeLocY)
         {
-            m_defaultHomeLocX = defaultHomeLocX;
-            m_defaultHomeLocY = defaultHomeLocY;
         }
 
-        public uint DefaultHomeLocX
-        {
-            get { return m_defaultHomeLocX.Value; }
-        }
-
-        public uint DefaultHomeLocY
-        {
-            get { return m_defaultHomeLocY.Value; }
-        }
 
         public void loadFromConfiguration(IConfigSource config)
         {
-            m_defaultHomeLocX = (uint) config.Configs["StandAlone"].GetInt("default_location_x", 1000);
-            m_defaultHomeLocY = (uint) config.Configs["StandAlone"].GetInt("default_location_y", 1000);
 
             HttpListenerPort =
                 (uint) config.Configs["Network"].GetInt("http_listener_port", (int) ConfigSettings.DefaultRegionHttpPort);
@@ -84,8 +69,6 @@ namespace OpenSim.Framework
                 (uint)config.Configs["Network"].GetInt("http_listener_sslport", ((int)ConfigSettings.DefaultRegionHttpPort+1));
             HttpUsesSSL = config.Configs["Network"].GetBoolean("http_listener_ssl", false);
             HttpSSLCN = config.Configs["Network"].GetString("http_listener_cn", "localhost");
-            ConfigSettings.DefaultRegionRemotingPort =
-                (uint) config.Configs["Network"].GetInt("remoting_listener_port", (int) ConfigSettings.DefaultRegionRemotingPort);
             GridURL =
                 config.Configs["Network"].GetString("grid_server_url",
                                                     "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort.ToString());