diff options
| author | Diva Canto | 2010-01-31 13:01:23 -0800 |
|---|---|---|
| committer | Diva Canto | 2010-01-31 13:01:23 -0800 |
| commit | 041594ed075049f804fc157700a6d78e54194c0b (patch) | |
| tree | ed89689bfdc1948b184438ee4c7329e0296660b4 /OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | |
| parent | * Bug fix in XInventoryData -- groupOwned is an int in the DB (diff) | |
| download | opensim-SC-041594ed075049f804fc157700a6d78e54194c0b.zip opensim-SC-041594ed075049f804fc157700a6d78e54194c0b.tar.gz opensim-SC-041594ed075049f804fc157700a6d78e54194c0b.tar.bz2 opensim-SC-041594ed075049f804fc157700a6d78e54194c0b.tar.xz | |
Cleaned up configuration. 'gridmode' and 'hypergrid' are gone, as well as lots of other obsolete configs.
Diffstat (limited to 'OpenSim/Region/DataSnapshot/DataSnapshotManager.cs')
| -rw-r--r-- | OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs index 4df9094..6949d7c 100644 --- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs +++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | |||
| @@ -101,21 +101,9 @@ namespace OpenSim.Region.DataSnapshot | |||
| 101 | try | 101 | try |
| 102 | { | 102 | { |
| 103 | m_enabled = config.Configs["DataSnapshot"].GetBoolean("index_sims", m_enabled); | 103 | m_enabled = config.Configs["DataSnapshot"].GetBoolean("index_sims", m_enabled); |
| 104 | if (config.Configs["Startup"].GetBoolean("gridmode", false)) | 104 | IConfig conf = config.Configs["GridService"]; |
| 105 | { | 105 | if (conf != null) |
| 106 | m_gridinfo.Add( | 106 | m_gridinfo.Add("gridserverURL", conf.GetString("GridServerURI", "http://127.0.0.1:8003")); |
| 107 | "gridserverURL", | ||
| 108 | config.Configs["Network"].GetString( | ||
| 109 | "grid_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort.ToString())); | ||
| 110 | m_gridinfo.Add( | ||
| 111 | "userserverURL", | ||
| 112 | config.Configs["Network"].GetString( | ||
| 113 | "user_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString())); | ||
| 114 | m_gridinfo.Add( | ||
| 115 | "assetserverURL", | ||
| 116 | config.Configs["Network"].GetString( | ||
| 117 | "asset_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultAssetServerHttpPort.ToString())); | ||
| 118 | } | ||
| 119 | 107 | ||
| 120 | m_gridinfo.Add( | 108 | m_gridinfo.Add( |
| 121 | "Name", config.Configs["DataSnapshot"].GetString("gridname", "the lost continent of hippo")); | 109 | "Name", config.Configs["DataSnapshot"].GetString("gridname", "the lost continent of hippo")); |