diff options
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Framework/GridConfig.cs')
-rw-r--r-- | OpenSim/Framework/GridConfig.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs index 9aa5d03..3a43a14 100644 --- a/OpenSim/Framework/GridConfig.cs +++ b/OpenSim/Framework/GridConfig.cs | |||
@@ -90,13 +90,13 @@ namespace OpenSim.Framework | |||
90 | 90 | ||
91 | m_configMember.addConfigurationOption("allow_forceful_banlines", | 91 | m_configMember.addConfigurationOption("allow_forceful_banlines", |
92 | ConfigurationOption.ConfigurationTypes.TYPE_STRING, | 92 | ConfigurationOption.ConfigurationTypes.TYPE_STRING, |
93 | "Allow Forceful Banlines", "TRUE", true); | 93 | "Allow Forceful Banlines", "TRUE", true); |
94 | 94 | ||
95 | m_configMember.addConfigurationOption("allow_region_registration", | 95 | m_configMember.addConfigurationOption("allow_region_registration", |
96 | ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, | 96 | ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, |
97 | "Allow regions to register immediately upon grid server startup? true/false", | 97 | "Allow regions to register immediately upon grid server startup? true/false", |
98 | "True", | 98 | "True", |
99 | false); | 99 | false); |
100 | m_configMember.addConfigurationOption("console_user", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | 100 | m_configMember.addConfigurationOption("console_user", ConfigurationOption.ConfigurationTypes.TYPE_STRING, |
101 | "Remote console access user name [Default: disabled]", "", false); | 101 | "Remote console access user name [Default: disabled]", "", false); |
102 | 102 | ||
@@ -147,7 +147,7 @@ namespace OpenSim.Framework | |||
147 | break; | 147 | break; |
148 | case "allow_region_registration": | 148 | case "allow_region_registration": |
149 | AllowRegionRegistration = (bool)configuration_result; | 149 | AllowRegionRegistration = (bool)configuration_result; |
150 | break; | 150 | break; |
151 | case "console_user": | 151 | case "console_user": |
152 | ConsoleUser = (string)configuration_result; | 152 | ConsoleUser = (string)configuration_result; |
153 | break; | 153 | break; |