diff options
author | mingchen | 2007-11-03 17:49:45 +0000 |
---|---|---|
committer | mingchen | 2007-11-03 17:49:45 +0000 |
commit | b51a900bebe914650c1c7db7b77f74c5ac107f6d (patch) | |
tree | b93c86b110df48df3c17823358fc2e2185319e0b /OpenSim/Framework/RegionInfo.cs | |
parent | * Removed unused UDPServerBase (diff) | |
download | opensim-SC-b51a900bebe914650c1c7db7b77f74c5ac107f6d.zip opensim-SC-b51a900bebe914650c1c7db7b77f74c5ac107f6d.tar.gz opensim-SC-b51a900bebe914650c1c7db7b77f74c5ac107f6d.tar.bz2 opensim-SC-b51a900bebe914650c1c7db7b77f74c5ac107f6d.tar.xz |
*Master Avatar can be specified by a previous UUID in either grid mode or standalone mode by specifying a master_avatar_uuid attribute in the place of master_avatar_xxxx_name and master_avatar_password.You will not be asked for the name and password if a valid UUID is specified.
Diffstat (limited to 'OpenSim/Framework/RegionInfo.cs')
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index a32b43c..2a75dbc 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -293,9 +293,19 @@ namespace OpenSim.Framework | |||
293 | configMember.addConfigurationOption("internal_ip_address", ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS, "Internal IP Address for incoming UDP client connections", "0.0.0.0", false); | 293 | configMember.addConfigurationOption("internal_ip_address", ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS, "Internal IP Address for incoming UDP client connections", "0.0.0.0", false); |
294 | configMember.addConfigurationOption("internal_ip_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "Internal IP Port for incoming UDP client connections", NetworkServersInfo.DefaultHttpListenerPort.ToString(), false); | 294 | configMember.addConfigurationOption("internal_ip_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "Internal IP Port for incoming UDP client connections", NetworkServersInfo.DefaultHttpListenerPort.ToString(), false); |
295 | configMember.addConfigurationOption("external_host_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "External Host Name", "127.0.0.1", false); | 295 | configMember.addConfigurationOption("external_host_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "External Host Name", "127.0.0.1", false); |
296 | configMember.addConfigurationOption("master_avatar_first", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "First Name of Master Avatar", "Test", false); | 296 | configMember.addConfigurationOption("master_avatar_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "Master Avatar UUID", LLUUID.Zero.ToString(), true); |
297 | configMember.addConfigurationOption("master_avatar_last", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Last Name of Master Avatar", "User", false); | 297 | configMember.addConfigurationOption("master_avatar_first", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "First Name of Master Avatar", "Test", false,(ConfigurationOption.ConfigurationOptionShouldBeAsked)shouldMasterAvatarDetailsBeAsked); |
298 | configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "(Sandbox Mode Only)Password for Master Avatar account", "test", false); | 298 | configMember.addConfigurationOption("master_avatar_last", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Last Name of Master Avatar", "User", false, (ConfigurationOption.ConfigurationOptionShouldBeAsked)shouldMasterAvatarDetailsBeAsked); |
299 | configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "(Sandbox Mode Only)Password for Master Avatar account", "test", false, (ConfigurationOption.ConfigurationOptionShouldBeAsked)shouldMasterAvatarDetailsBeAsked); | ||
300 | } | ||
301 | |||
302 | public bool shouldMasterAvatarDetailsBeAsked(string configuration_key) | ||
303 | { | ||
304 | if (MasterAvatarAssignedUUID == null || MasterAvatarAssignedUUID.ToStringHyphenated() == LLUUID.Zero.ToStringHyphenated()) | ||
305 | { | ||
306 | return true; | ||
307 | } | ||
308 | return false; | ||
299 | } | 309 | } |
300 | 310 | ||
301 | public bool handleIncomingConfiguration(string configuration_key, object configuration_result) | 311 | public bool handleIncomingConfiguration(string configuration_key, object configuration_result) |
@@ -334,6 +344,9 @@ namespace OpenSim.Framework | |||
334 | this.m_externalHostName = Util.GetLocalHost().ToString(); | 344 | this.m_externalHostName = Util.GetLocalHost().ToString(); |
335 | } | 345 | } |
336 | break; | 346 | break; |
347 | case "master_avatar_uuid": | ||
348 | this.MasterAvatarAssignedUUID = (LLUUID)configuration_result; | ||
349 | break; | ||
337 | case "master_avatar_first": | 350 | case "master_avatar_first": |
338 | this.MasterAvatarFirstName = (string)configuration_result; | 351 | this.MasterAvatarFirstName = (string)configuration_result; |
339 | break; | 352 | break; |