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/DataSnapshot | |
| parent | * remind me to never touch EstateSettings ever again. Ever. (diff) | |
| download | opensim-SC_OLD-a189da844a1ec48b321674f49a81c4e0a71c8b81.zip opensim-SC_OLD-a189da844a1ec48b321674f49a81c4e0a71c8b81.tar.gz opensim-SC_OLD-a189da844a1ec48b321674f49a81c4e0a71c8b81.tar.bz2 opensim-SC_OLD-a189da844a1ec48b321674f49a81c4e0a71c8b81.tar.xz | |
* Moved the DefaultConfig settings into already-existing ConfigSettings
Diffstat (limited to 'OpenSim/Region/DataSnapshot')
| -rw-r--r-- | OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs index 9a768ac..fd5c142 100644 --- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs +++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | |||
| @@ -64,7 +64,7 @@ namespace OpenSim.Region.DataSnapshot | |||
| 64 | 64 | ||
| 65 | //DataServices and networking | 65 | //DataServices and networking |
| 66 | private string m_dataServices = "noservices"; | 66 | private string m_dataServices = "noservices"; |
| 67 | public string m_listener_port = DefaultSettings.DefaultRegionHttpPort.ToString(); | 67 | public string m_listener_port = ConfigSettings.DefaultRegionHttpPort.ToString(); |
| 68 | public string m_hostname = "127.0.0.1"; | 68 | public string m_hostname = "127.0.0.1"; |
| 69 | 69 | ||
| 70 | //Update timers | 70 | //Update timers |
| @@ -106,15 +106,15 @@ namespace OpenSim.Region.DataSnapshot | |||
| 106 | m_gridinfo.Add( | 106 | m_gridinfo.Add( |
| 107 | "gridserverURL", | 107 | "gridserverURL", |
| 108 | config.Configs["Network"].GetString( | 108 | config.Configs["Network"].GetString( |
| 109 | "grid_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultGridServerHttpPort.ToString())); | 109 | "grid_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort.ToString())); |
| 110 | m_gridinfo.Add( | 110 | m_gridinfo.Add( |
| 111 | "userserverURL", | 111 | "userserverURL", |
| 112 | config.Configs["Network"].GetString( | 112 | config.Configs["Network"].GetString( |
| 113 | "user_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultUserServerHttpPort.ToString())); | 113 | "user_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString())); |
| 114 | m_gridinfo.Add( | 114 | m_gridinfo.Add( |
| 115 | "assetserverURL", | 115 | "assetserverURL", |
| 116 | config.Configs["Network"].GetString( | 116 | config.Configs["Network"].GetString( |
| 117 | "asset_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultAssetServerHttpPort.ToString())); | 117 | "asset_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultAssetServerHttpPort.ToString())); |
| 118 | } | 118 | } |
| 119 | 119 | ||
| 120 | m_gridinfo.Add( | 120 | m_gridinfo.Add( |