diff options
| author | MW | 2007-12-03 09:50:33 +0000 |
|---|---|---|
| committer | MW | 2007-12-03 09:50:33 +0000 |
| commit | 634a22185d324e8aed763785775244a3e5876dfa (patch) | |
| tree | ee0945b18742a65ca0890806525d01df1f64aace /OpenSim | |
| parent | added svn:ignore on stuff in ApplicationPlugins/RemoteController (diff) | |
| download | opensim-SC-634a22185d324e8aed763785775244a3e5876dfa.zip opensim-SC-634a22185d324e8aed763785775244a3e5876dfa.tar.gz opensim-SC-634a22185d324e8aed763785775244a3e5876dfa.tar.bz2 opensim-SC-634a22185d324e8aed763785775244a3e5876dfa.tar.xz | |
Applied patch from mantis issue #110 (with one or two tiny changes) , thanks mpallari/_SomeOne_
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 9fd5bcc..1f9894c 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
| @@ -212,6 +212,15 @@ namespace OpenSim | |||
| 212 | config.Set("asset_server_url", "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString()); | 212 | config.Set("asset_server_url", "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString()); |
| 213 | config.Set("inventory_server_url", "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort.ToString()); | 213 | config.Set("inventory_server_url", "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort.ToString()); |
| 214 | } | 214 | } |
| 215 | |||
| 216 | |||
| 217 | if (m_config.Configs["RemoteAdmin"] == null) | ||
| 218 | m_config.AddConfig("RemoteAdmin"); | ||
| 219 | config = m_config.Configs["RemoteAdmin"]; | ||
| 220 | if (config != null) | ||
| 221 | { | ||
| 222 | config.Set("enabled", "false"); | ||
| 223 | } | ||
| 215 | } | 224 | } |
| 216 | 225 | ||
| 217 | protected void ReadConfigSettings() | 226 | protected void ReadConfigSettings() |