diff options
author | Teravus Ovares | 2007-12-18 12:08:34 +0000 |
---|---|---|
committer | Teravus Ovares | 2007-12-18 12:08:34 +0000 |
commit | ccc8ffaaec915f0561d9aded6cc4b32b911f473c (patch) | |
tree | e07135474e1986cd09177db8e62787b4f74c114a /OpenSim/Framework/RegionInfo.cs | |
parent | * Removed redundant code in RestService.cs (diff) | |
download | opensim-SC_OLD-ccc8ffaaec915f0561d9aded6cc4b32b911f473c.zip opensim-SC_OLD-ccc8ffaaec915f0561d9aded6cc4b32b911f473c.tar.gz opensim-SC_OLD-ccc8ffaaec915f0561d9aded6cc4b32b911f473c.tar.bz2 opensim-SC_OLD-ccc8ffaaec915f0561d9aded6cc4b32b911f473c.tar.xz |
* Added Incomplete Handling of the RegionInfoRequest packet
* Added Incomplete Handling of the EstateCovenantRequest packet
* Added Incomplete Handling of the EstateOwnerMessageRequest.ChangeEstateCovenantid method
* Fixed a race condition with avatar animations
Diffstat (limited to 'OpenSim/Framework/RegionInfo.cs')
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index fba78a9..6a9de2c 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -199,6 +199,7 @@ namespace OpenSim.Framework | |||
199 | public bool commFailTF = false; | 199 | public bool commFailTF = false; |
200 | 200 | ||
201 | public LLUUID MasterAvatarAssignedUUID = LLUUID.Zero; | 201 | public LLUUID MasterAvatarAssignedUUID = LLUUID.Zero; |
202 | public LLUUID CovenantID = LLUUID.Zero; | ||
202 | public string MasterAvatarFirstName = ""; | 203 | public string MasterAvatarFirstName = ""; |
203 | public string MasterAvatarLastName = ""; | 204 | public string MasterAvatarLastName = ""; |
204 | public string MasterAvatarSandboxPassword = ""; | 205 | public string MasterAvatarSandboxPassword = ""; |
@@ -316,7 +317,8 @@ namespace OpenSim.Framework | |||
316 | configMember.addConfigurationOption("internal_ip_address", ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS, "Internal IP Address for incoming UDP client connections", "0.0.0.0", false); | 317 | configMember.addConfigurationOption("internal_ip_address", ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS, "Internal IP Address for incoming UDP client connections", "0.0.0.0", false); |
317 | configMember.addConfigurationOption("internal_ip_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "Internal IP Port for incoming UDP client connections", NetworkServersInfo.DefaultHttpListenerPort.ToString(), false); | 318 | configMember.addConfigurationOption("internal_ip_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "Internal IP Port for incoming UDP client connections", NetworkServersInfo.DefaultHttpListenerPort.ToString(), false); |
318 | configMember.addConfigurationOption("external_host_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "External Host Name", "127.0.0.1", false); | 319 | configMember.addConfigurationOption("external_host_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "External Host Name", "127.0.0.1", false); |
319 | configMember.addConfigurationOption("master_avatar_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "Master Avatar UUID", LLUUID.Zero.ToString(), true); | 320 | configMember.addConfigurationOption("master_avatar_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "Master Avatar UUID", LLUUID.Zero.ToStringHyphenated(), true); |
321 | configMember.addConfigurationOption("estate_covanant_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "Estate Covenant", LLUUID.Zero.ToStringHyphenated(), true); | ||
320 | configMember.addConfigurationOption("master_avatar_first", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "First Name of Master Avatar", "Test", false,(ConfigurationOption.ConfigurationOptionShouldBeAsked)shouldMasterAvatarDetailsBeAsked); | 322 | configMember.addConfigurationOption("master_avatar_first", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "First Name of Master Avatar", "Test", false,(ConfigurationOption.ConfigurationOptionShouldBeAsked)shouldMasterAvatarDetailsBeAsked); |
321 | configMember.addConfigurationOption("master_avatar_last", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Last Name of Master Avatar", "User", false, (ConfigurationOption.ConfigurationOptionShouldBeAsked)shouldMasterAvatarDetailsBeAsked); | 323 | configMember.addConfigurationOption("master_avatar_last", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Last Name of Master Avatar", "User", false, (ConfigurationOption.ConfigurationOptionShouldBeAsked)shouldMasterAvatarDetailsBeAsked); |
322 | configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "(Sandbox Mode Only)Password for Master Avatar account", "test", false, (ConfigurationOption.ConfigurationOptionShouldBeAsked)shouldMasterAvatarDetailsBeAsked); | 324 | configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "(Sandbox Mode Only)Password for Master Avatar account", "test", false, (ConfigurationOption.ConfigurationOptionShouldBeAsked)shouldMasterAvatarDetailsBeAsked); |
@@ -370,6 +372,10 @@ namespace OpenSim.Framework | |||
370 | case "master_avatar_uuid": | 372 | case "master_avatar_uuid": |
371 | this.MasterAvatarAssignedUUID = (LLUUID)configuration_result; | 373 | this.MasterAvatarAssignedUUID = (LLUUID)configuration_result; |
372 | break; | 374 | break; |
375 | case "estate_covanant_uuid": | ||
376 | this.CovenantID = (LLUUID)configuration_result; | ||
377 | break; | ||
378 | |||
373 | case "master_avatar_first": | 379 | case "master_avatar_first": |
374 | this.MasterAvatarFirstName = (string)configuration_result; | 380 | this.MasterAvatarFirstName = (string)configuration_result; |
375 | break; | 381 | break; |