aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-10-04 19:17:39 +0000
committerJustin Clarke Casey2008-10-04 19:17:39 +0000
commit344e33b8fc91876d073edd7ff55b3b99deb07c31 (patch)
tree86aaab84658098e27c31caec7f021844cef89227 /OpenSim
parentMantis#2316. Thank you kindly, CMickeyb for a patch that: (diff)
downloadopensim-SC_OLD-344e33b8fc91876d073edd7ff55b3b99deb07c31.zip
opensim-SC_OLD-344e33b8fc91876d073edd7ff55b3b99deb07c31.tar.gz
opensim-SC_OLD-344e33b8fc91876d073edd7ff55b3b99deb07c31.tar.bz2
opensim-SC_OLD-344e33b8fc91876d073edd7ff55b3b99deb07c31.tar.xz
* minor: both OpenSimBase and the Voice and RemoteAdmin modules were checking whether any config was set
* Resolve redundancy by removing the OpenSimBase check - if modules are recieve nini config directly they should probably be the ones to do the checking
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs18
1 files changed, 0 insertions, 18 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 5301e96..c1a5825 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -265,24 +265,6 @@ namespace OpenSim
265 config.Set("inventory_server_url", "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort.ToString()); 265 config.Set("inventory_server_url", "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort.ToString());
266 config.Set("secure_inventory_server", "true"); 266 config.Set("secure_inventory_server", "true");
267 } 267 }
268
269 {
270 IConfig config = DefaultConfig.Configs["RemoteAdmin"];
271
272 if (null == config)
273 config = DefaultConfig.AddConfig("RemoteAdmin");
274
275 config.Set("enabled", "false");
276 }
277
278 {
279 IConfig config = DefaultConfig.Configs["Voice"];
280
281 if (null == config)
282 config = DefaultConfig.AddConfig("Voice");
283
284 config.Set("enabled", "false");
285 }
286 268
287 return DefaultConfig; 269 return DefaultConfig;
288 } 270 }