diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/ConfigSettings.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/InventoryConfig.cs | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Framework/ConfigSettings.cs b/OpenSim/Framework/ConfigSettings.cs index 93efffa..32415e0 100644 --- a/OpenSim/Framework/ConfigSettings.cs +++ b/OpenSim/Framework/ConfigSettings.cs | |||
@@ -168,7 +168,7 @@ namespace OpenSim.Framework | |||
168 | public const bool DefaultUserServerHttpSSL = false; | 168 | public const bool DefaultUserServerHttpSSL = false; |
169 | public const uint DefaultMessageServerHttpPort = 8006; | 169 | public const uint DefaultMessageServerHttpPort = 8006; |
170 | public const bool DefaultMessageServerHttpSSL = false; | 170 | public const bool DefaultMessageServerHttpSSL = false; |
171 | public const uint DefaultGridServerHttpPort = 8001; | 171 | public const uint DefaultGridServerHttpPort = 8003; |
172 | public const uint DefaultInventoryServerHttpPort = 8004; | 172 | public const uint DefaultInventoryServerHttpPort = 8003; |
173 | } | 173 | } |
174 | } | 174 | } |
diff --git a/OpenSim/Framework/InventoryConfig.cs b/OpenSim/Framework/InventoryConfig.cs index f539d55..dd207ad 100644 --- a/OpenSim/Framework/InventoryConfig.cs +++ b/OpenSim/Framework/InventoryConfig.cs | |||
@@ -56,15 +56,15 @@ namespace OpenSim.Framework | |||
56 | m_configMember.addConfigurationOption("default_inventory_server", | 56 | m_configMember.addConfigurationOption("default_inventory_server", |
57 | ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, | 57 | ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, |
58 | "Default Inventory Server URI (this server's external name)", | 58 | "Default Inventory Server URI (this server's external name)", |
59 | "http://127.0.0.1:8004", false); | 59 | "http://127.0.0.1:" + ConfigSettings.DefaultInventoryServerHttpPort, false); |
60 | m_configMember.addConfigurationOption("default_user_server", | 60 | m_configMember.addConfigurationOption("default_user_server", |
61 | ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, | 61 | ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, |
62 | "Default User Server URI", | 62 | "Default User Server URI", |
63 | "http://127.0.0.1:8002", false); | 63 | "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort, false); |
64 | m_configMember.addConfigurationOption("default_asset_server", | 64 | m_configMember.addConfigurationOption("default_asset_server", |
65 | ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, | 65 | ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, |
66 | "Default Asset Server URI", | 66 | "Default Asset Server URI", |
67 | "http://127.0.0.1:8003", false); | 67 | "http://127.0.0.1:" + ConfigSettings.DefaultAssetServerHttpPort, false); |
68 | m_configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | 68 | m_configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, |
69 | "DLL for database provider", "OpenSim.Data.MySQL.dll", false); | 69 | "DLL for database provider", "OpenSim.Data.MySQL.dll", false); |
70 | m_configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | 70 | m_configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING, |