aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/GridConfig.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/GridConfig.cs')
-rw-r--r--OpenSim/Framework/GridConfig.cs12
1 files changed, 11 insertions, 1 deletions
diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs
index 889f345..52bc3d6 100644
--- a/OpenSim/Framework/GridConfig.cs
+++ b/OpenSim/Framework/GridConfig.cs
@@ -34,6 +34,7 @@ namespace OpenSim.Framework
34 public static uint DefaultHttpPort = 8001; 34 public static uint DefaultHttpPort = 8001;
35 35
36 public string AllowForcefulBanlines = "TRUE"; 36 public string AllowForcefulBanlines = "TRUE";
37 public bool AllowRegionRegistration = true;
37 public string AssetRecvKey = String.Empty; 38 public string AssetRecvKey = String.Empty;
38 public string AssetSendKey = String.Empty; 39 public string AssetSendKey = String.Empty;
39 40
@@ -90,7 +91,13 @@ namespace OpenSim.Framework
90 91
91 configMember.addConfigurationOption("allow_forceful_banlines", 92 configMember.addConfigurationOption("allow_forceful_banlines",
92 ConfigurationOption.ConfigurationTypes.TYPE_STRING, 93 ConfigurationOption.ConfigurationTypes.TYPE_STRING,
93 "Allow Forceful Banlines", "TRUE", true); 94 "Allow Forceful Banlines", "TRUE", true);
95
96 configMember.addConfigurationOption("allow_region_registration",
97 ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
98 "Allow regions to register immediately upon grid server startup? true/false",
99 "True",
100 false);
94 } 101 }
95 102
96 public bool handleIncomingConfiguration(string configuration_key, object configuration_result) 103 public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
@@ -133,6 +140,9 @@ namespace OpenSim.Framework
133 case "allow_forceful_banlines": 140 case "allow_forceful_banlines":
134 AllowForcefulBanlines = (string) configuration_result; 141 AllowForcefulBanlines = (string) configuration_result;
135 break; 142 break;
143 case "allow_region_registration":
144 AllowRegionRegistration = (bool)configuration_result;
145 break;
136 } 146 }
137 147
138 return true; 148 return true;