aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-02-03 20:16:15 +0000
committerJustin Clarke Casey2009-02-03 20:16:15 +0000
commit1c0df5e40f7452a85e32be47b08a7da691f034a3 (patch)
tree879a515d29db9fa2882744aa41e802a645a1960b
parent* Fission SceneObjectTests into basic and linking sets (diff)
downloadopensim-SC_OLD-1c0df5e40f7452a85e32be47b08a7da691f034a3.zip
opensim-SC_OLD-1c0df5e40f7452a85e32be47b08a7da691f034a3.tar.gz
opensim-SC_OLD-1c0df5e40f7452a85e32be47b08a7da691f034a3.tar.bz2
opensim-SC_OLD-1c0df5e40f7452a85e32be47b08a7da691f034a3.tar.xz
* Address http://opensimulator.org/mantis/view.php?id=3076 by actually eliminating the redundant enable = true commented example
* Comment out some startup verbosity from the module if we haven't enabled it
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs4
-rw-r--r--bin/OpenSim.ini.example3
2 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs
index 6e2bf53..7cfe2f9 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs
@@ -82,13 +82,13 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge
82 { 82 {
83 if ((_config = config.Configs["Concierge"]) == null) 83 if ((_config = config.Configs["Concierge"]) == null)
84 { 84 {
85 _log.InfoFormat("[Concierge]: no configuration section [Concierge] in OpenSim.ini: module not configured"); 85 //_log.InfoFormat("[Concierge]: no configuration section [Concierge] in OpenSim.ini: module not configured");
86 return; 86 return;
87 } 87 }
88 88
89 if (!_config.GetBoolean("enabled", false)) 89 if (!_config.GetBoolean("enabled", false))
90 { 90 {
91 _log.InfoFormat("[Concierge]: module disabled by OpenSim.ini configuration"); 91 //_log.InfoFormat("[Concierge]: module disabled by OpenSim.ini configuration");
92 return; 92 return;
93 } 93 }
94 } 94 }
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index f080610..532a710 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -968,7 +968,8 @@ InterregionComms = "RESTComms"
968 968
969 969
970[Concierge] 970[Concierge]
971 ; enable = true 971 ; Enable concierge module
972 ; Default is false
972 enabled = false 973 enabled = false
973 974
974 ; name of the concierge 975 ; name of the concierge