diff options
| author | John Hurliman | 2009-10-06 15:54:00 -0700 |
|---|---|---|
| committer | John Hurliman | 2009-10-06 15:54:00 -0700 |
| commit | 832cc685138b2244529f10b54b373c34adb4a633 (patch) | |
| tree | 888cf05d2d0bacdd8acec47150075423d07ed3ee /OpenSim/Framework/InventoryConfig.cs | |
| parent | Checks the number of ThreadPool and IOCP threads on startup and bumps up the ... (diff) | |
| parent | Rewrote parts of the code that were double-locking different objects. This is... (diff) | |
| download | opensim-SC_OLD-832cc685138b2244529f10b54b373c34adb4a633.zip opensim-SC_OLD-832cc685138b2244529f10b54b373c34adb4a633.tar.gz opensim-SC_OLD-832cc685138b2244529f10b54b373c34adb4a633.tar.bz2 opensim-SC_OLD-832cc685138b2244529f10b54b373c34adb4a633.tar.xz | |
Merging in diva's locking fixes
Diffstat (limited to 'OpenSim/Framework/InventoryConfig.cs')
| -rw-r--r-- | OpenSim/Framework/InventoryConfig.cs | 6 |
1 files changed, 3 insertions, 3 deletions
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, |