diff options
author | mingchen | 2008-01-04 14:14:15 +0000 |
---|---|---|
committer | mingchen | 2008-01-04 14:14:15 +0000 |
commit | 81b4c7be3e84b29e5fcc387f578afdc07b806048 (patch) | |
tree | 5e835924288eb49fb92d293133ee68ae728d7f60 /OpenSim/Framework/RegionInfo.cs | |
parent | * Fixed situation where sometimes your avatar tries to land and gets 'put' 80... (diff) | |
download | opensim-SC_OLD-81b4c7be3e84b29e5fcc387f578afdc07b806048.zip opensim-SC_OLD-81b4c7be3e84b29e5fcc387f578afdc07b806048.tar.gz opensim-SC_OLD-81b4c7be3e84b29e5fcc387f578afdc07b806048.tar.bz2 opensim-SC_OLD-81b4c7be3e84b29e5fcc387f578afdc07b806048.tar.xz |
*Added ability to skip any use of the console when configuring and assume default value. This is useful when the server is running by itself and a new region request is added without sufficient information
Diffstat (limited to 'OpenSim/Framework/RegionInfo.cs')
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 17811cd..3c4fcba 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -187,17 +187,17 @@ namespace OpenSim.Framework | |||
187 | 187 | ||
188 | public ConfigurationMember configMember; | 188 | public ConfigurationMember configMember; |
189 | 189 | ||
190 | public RegionInfo(string description, string filename) | 190 | public RegionInfo(string description, string filename, bool skipConsoleConfig) |
191 | { | 191 | { |
192 | configMember = | 192 | configMember = |
193 | new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration); | 193 | new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration,!skipConsoleConfig); |
194 | configMember.performConfigurationRetrieve(); | 194 | configMember.performConfigurationRetrieve(); |
195 | } | 195 | } |
196 | 196 | ||
197 | public RegionInfo(string description, XmlNode xmlNode) | 197 | public RegionInfo(string description, XmlNode xmlNode, bool skipConsoleConfig) |
198 | { | 198 | { |
199 | configMember = | 199 | configMember = |
200 | new ConfigurationMember(xmlNode, description, loadConfigurationOptions, handleIncomingConfiguration); | 200 | new ConfigurationMember(xmlNode, description, loadConfigurationOptions, handleIncomingConfiguration, !skipConsoleConfig); |
201 | configMember.performConfigurationRetrieve(); | 201 | configMember.performConfigurationRetrieve(); |
202 | } | 202 | } |
203 | 203 | ||