*Moved network_servers_info.xml into OpenSim.ini under [Network]

3 files changed, 41 insertions, 67 deletions

diff --git a/OpenSim/Framework/General/Types/NetworkServersInfo.cs b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
index ae19aff..4ccd5df 100644
--- a/OpenSim/Framework/General/Types/NetworkServersInfo.cs
+++ b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
@@ -30,6 +30,7 @@ using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Configuration;
 
+using Nini.Config;
 namespace OpenSim.Framework.Types
 {
     public class NetworkServersInfo
@@ -48,15 +49,12 @@ namespace OpenSim.Framework.Types
         public int HttpListenerPort = 9000;
         public int RemotingListenerPort = 8895;
 
-        private ConfigurationMember configMember;
 
-        public NetworkServersInfo(string description, string filename)
+        public NetworkServersInfo()
         {
-            configMember = new ConfigurationMember(filename, description, loadConfigurationOptions, handleConfigurationItem);
-            configMember.performConfigurationRetrieve();
         }
 
-        public NetworkServersInfo( uint defaultHomeLocX, uint defaultHomeLocY )
+        public NetworkServersInfo(uint defaultHomeLocX, uint defaultHomeLocY)
         {
             m_defaultHomeLocX = defaultHomeLocX;
             m_defaultHomeLocY = defaultHomeLocY;
@@ -74,65 +72,21 @@ namespace OpenSim.Framework.Types
             get { return m_defaultHomeLocY.Value; }
         }
 
-        public void loadConfigurationOptions()
+        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);
 
-            configMember.addConfigurationOption("HttpListenerPort", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "HTTP Listener Port", "9000", false);
-            configMember.addConfigurationOption("RemotingListenerPort", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "Remoting Listener Port", "8895", false);
-            configMember.addConfigurationOption("DefaultLocationX", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Default Home Location (X Axis)", "1000", false);
-            configMember.addConfigurationOption("DefaultLocationY", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Default Home Location (Y Axis)", "1000", false);
+            HttpListenerPort = config.Configs["Network"].GetInt("http_listener_port", 9000);
+            RemotingListenerPort = config.Configs["Network"].GetInt("remoting_listener_port", 8895);
+            GridURL = config.Configs["Network"].GetString("grid_server_url", "http://127.0.0.1:8001");
+            GridSendKey = config.Configs["Network"].GetString("grid_send_key", "null");
+            GridRecvKey = config.Configs["Network"].GetString("grid_recv_key", "null");
+            UserURL = config.Configs["Network"].GetString("user_server_url", "http://127.0.0.1:8002");
+            UserSendKey = config.Configs["Network"].GetString("user_send_key", "null");
+            UserRecvKey = config.Configs["Network"].GetString("user_recv_key", "null");
+            AssetURL = config.Configs["Network"].GetString("asset_server_url", "http://127.0.0.1:8003");
 
-            configMember.addConfigurationOption("GridServerURL", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Grid Server URL", "http://127.0.0.1:8001", false);
-            configMember.addConfigurationOption("GridSendKey", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to grid server", "null", false);
-            configMember.addConfigurationOption("GridRecvKey", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from grid server", "null", false);
-
-            configMember.addConfigurationOption("UserServerURL", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "User Server URL", "http://127.0.0.1:8002", false);
-            configMember.addConfigurationOption("UserSendKey", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to user server", "null", false);
-            configMember.addConfigurationOption("UserRecvKey", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from user server", "null", false);
-
-            configMember.addConfigurationOption("AssetServerURL", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Asset Server URL", "http://127.0.0.1:8003", false);
-        }
-
-        public bool handleConfigurationItem(string configuration_key, object configuration_object)
-        {
-            switch (configuration_key)
-            {
-                case "HttpListenerPort":
-                    this.HttpListenerPort = (int)configuration_object;
-                    break;
-                case "RemotingListenerPort":
-                    this.RemotingListenerPort = (int)configuration_object;
-                    break;
-                case "DefaultLocationX":
-                    this.m_defaultHomeLocX = (uint)configuration_object;
-                    break;
-                case "DefaultLocationY":
-                    this.m_defaultHomeLocY = (uint)configuration_object;
-                    break;
-                case "GridServerURL":
-                    this.GridURL = (string)configuration_object;
-                    break;
-                case "GridSendKey":
-                    this.GridSendKey = (string)configuration_object;
-                    break;
-                case "GridRecvKey":
-                    this.GridRecvKey = (string)configuration_object;
-                    break;
-                case "UserServerURL":
-                    this.UserURL = (string)configuration_object;
-                    break;
-                case "UserSendKey":
-                    this.UserSendKey = (string)configuration_object;
-                    break;
-                case "UserRecvKey":
-                    this.UserRecvKey = (string)configuration_object;
-                    break;
-                case "AssetServerURL":
-                    this.AssetURL = (string)configuration_object;
-                    break;
-            }
-
-            return true;
         }
     }
 }
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 71fa2c0..e58fb2a 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -102,6 +102,7 @@ namespace OpenSim
 
         protected void ReadConfigSettings(IConfigSource configSource)
         {
+            m_networkServersInfo = new NetworkServersInfo();
             m_sandbox = !configSource.Configs["Startup"].GetBoolean("gridmode", false);
             m_physicsEngine = configSource.Configs["Startup"].GetString("physics", "basicphysics");
             m_silent = configSource.Configs["Startup"].GetBoolean("noverbose", false);
@@ -114,6 +115,8 @@ namespace OpenSim
             standaloneWelcomeMessage = configSource.Configs["StandAlone"].GetString("welcome_message", "Welcome to OpenSim");
             standaloneInventoryPlugin = configSource.Configs["StandAlone"].GetString("inventory_plugin", "OpenSim.Framework.Data.SQLite.dll");
             standaloneUserPlugin = configSource.Configs["StandAlone"].GetString("userDatabase_plugin", "OpenSim.Framework.Data.DB4o.dll");
+
+            m_networkServersInfo.loadFromConfiguration(configSource);
         }
 
         /// <summary>
@@ -134,9 +137,9 @@ namespace OpenSim
             if (m_sandbox)
             {
                 CommunicationsLocal.LocalSettings settings = new CommunicationsLocal.LocalSettings(standaloneWelcomeMessage, standaloneAuthenticate, standaloneInventoryPlugin, standaloneUserPlugin);
-                CommunicationsLocal localComms  = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, settings);
+                CommunicationsLocal localComms = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, settings);
                 m_commsManager = localComms;
-                if(standaloneAuthenticate)
+                if (standaloneAuthenticate)
                 {
                     this.CreateAccount = localComms.doCreate;
                 }
@@ -164,7 +167,7 @@ namespace OpenSim
 
             // Load all script engines found
             OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineLoader ScriptEngineLoader = new OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineLoader(m_log);
-            
+
             for (int i = 0; i < configFiles.Length; i++)
             {
                 //Console.WriteLine("Loading region config file");
@@ -174,7 +177,7 @@ namespace OpenSim
                 UDPServer udpServer;
                 Scene scene = SetupScene(regionInfo, out udpServer);
 
-                
+
                 OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface ScriptEngine = ScriptEngineLoader.LoadScriptEngine("DotNetEngine");
                 scene.AddScriptEngine(ScriptEngine, m_log);
                 // TODO: TEMP load default script
@@ -238,7 +241,6 @@ namespace OpenSim
 
         protected override void Initialize()
         {
-            m_networkServersInfo = new NetworkServersInfo("NETWORK SERVERS INFO", Path.Combine(Util.configDir(), "network_servers_information.xml"));
             m_httpServerPort = m_networkServersInfo.HttpListenerPort;
             m_assetCache = new AssetCache("OpenSim.Region.GridInterfaces.Local.dll", m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey);
         }
diff --git a/bin/OpenSim.ini b/bin/OpenSim.ini
index 5475681..d876e3c 100644
--- a/bin/OpenSim.ini
+++ b/bin/OpenSim.ini
@@ -4,8 +4,26 @@ physics = basicphysics
 storage_plugin = "OpenSim.DataStore.NullStorage.dll"

 startup_console_commands_file = "startup_commands.txt"

 

+

 [StandAlone]

 accounts_authenticate = false

 welcome_message = "Welcome to OpenSim"

 inventory_plugin = "OpenSim.Framework.Data.SQLite.dll"

-userDatabase_plugin = "OpenSim.Framework.Data.DB4o.dll"
\ No newline at end of file
+userDatabase_plugin = "OpenSim.Framework.Data.DB4o.dll"

+default_location_x = 1000

+default_location_y = 1000

+

+

+[Network]

+http_listener_port = 9000

+remoting_listener_port = 8895

+

+grid_server_url = "http://127.0.0.1:8001"

+grid_send_key = "null"

+grid_recv_key = "null"

+

+user_server_url = "http://127.0.0.1:8002"

+user_send_key = "null"

+user_recv_key = "null"

+

+asset_server_url = "http://127.0.0.1:8003"