diff options
| author | lbsa71 | 2009-04-17 15:09:37 +0000 |
|---|---|---|
| committer | lbsa71 | 2009-04-17 15:09:37 +0000 |
| commit | a189da844a1ec48b321674f49a81c4e0a71c8b81 (patch) | |
| tree | eb55b24007c0f221a7d9f84bdbb12282d161c777 /OpenSim/Region/Application | |
| parent | * remind me to never touch EstateSettings ever again. Ever. (diff) | |
| download | opensim-SC-a189da844a1ec48b321674f49a81c4e0a71c8b81.zip opensim-SC-a189da844a1ec48b321674f49a81c4e0a71c8b81.tar.gz opensim-SC-a189da844a1ec48b321674f49a81c4e0a71c8b81.tar.bz2 opensim-SC-a189da844a1ec48b321674f49a81c4e0a71c8b81.tar.xz | |
* Moved the DefaultConfig settings into already-existing ConfigSettings
Diffstat (limited to 'OpenSim/Region/Application')
| -rw-r--r-- | OpenSim/Region/Application/ConfigurationLoader.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs index f609cc5..fea3e94 100644 --- a/OpenSim/Region/Application/ConfigurationLoader.cs +++ b/OpenSim/Region/Application/ConfigurationLoader.cs | |||
| @@ -252,16 +252,16 @@ namespace OpenSim | |||
| 252 | 252 | ||
| 253 | config.Set("default_location_x", 1000); | 253 | config.Set("default_location_x", 1000); |
| 254 | config.Set("default_location_y", 1000); | 254 | config.Set("default_location_y", 1000); |
| 255 | config.Set("http_listener_port", DefaultSettings.DefaultRegionHttpPort); | 255 | config.Set("http_listener_port", ConfigSettings.DefaultRegionHttpPort); |
| 256 | config.Set("remoting_listener_port", DefaultSettings.DefaultRegionRemotingPort); | 256 | config.Set("remoting_listener_port", ConfigSettings.DefaultRegionRemotingPort); |
| 257 | config.Set("grid_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultGridServerHttpPort.ToString()); | 257 | config.Set("grid_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort.ToString()); |
| 258 | config.Set("grid_send_key", "null"); | 258 | config.Set("grid_send_key", "null"); |
| 259 | config.Set("grid_recv_key", "null"); | 259 | config.Set("grid_recv_key", "null"); |
| 260 | config.Set("user_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultUserServerHttpPort.ToString()); | 260 | config.Set("user_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString()); |
| 261 | config.Set("user_send_key", "null"); | 261 | config.Set("user_send_key", "null"); |
| 262 | config.Set("user_recv_key", "null"); | 262 | config.Set("user_recv_key", "null"); |
| 263 | config.Set("asset_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultAssetServerHttpPort.ToString()); | 263 | config.Set("asset_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultAssetServerHttpPort.ToString()); |
| 264 | config.Set("inventory_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultInventoryServerHttpPort.ToString()); | 264 | config.Set("inventory_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultInventoryServerHttpPort.ToString()); |
| 265 | config.Set("secure_inventory_server", "true"); | 265 | config.Set("secure_inventory_server", "true"); |
| 266 | } | 266 | } |
| 267 | 267 | ||