diff options
Diffstat (limited to 'OpenSim/Framework/RegionInfo.cs')
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 1d9d9ec..716849c 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -50,7 +50,7 @@ namespace OpenSim.Framework | |||
50 | set { m_httpPort = value; } | 50 | set { m_httpPort = value; } |
51 | } | 51 | } |
52 | protected uint m_httpPort; | 52 | protected uint m_httpPort; |
53 | 53 | ||
54 | /// <summary> | 54 | /// <summary> |
55 | /// A well-formed URI for the host region server (namely "http://" + ExternalHostName) | 55 | /// A well-formed URI for the host region server (namely "http://" + ExternalHostName) |
56 | /// </summary> | 56 | /// </summary> |
@@ -58,17 +58,17 @@ namespace OpenSim.Framework | |||
58 | { | 58 | { |
59 | get { return m_serverURI; } | 59 | get { return m_serverURI; } |
60 | set { m_serverURI = value; } | 60 | set { m_serverURI = value; } |
61 | } | 61 | } |
62 | protected string m_serverURI; | 62 | protected string m_serverURI; |
63 | 63 | ||
64 | protected bool Allow_Alternate_Ports; | 64 | protected bool Allow_Alternate_Ports; |
65 | public bool m_allow_alternate_ports; | 65 | public bool m_allow_alternate_ports; |
66 | protected string m_externalHostName; | 66 | protected string m_externalHostName; |
67 | 67 | ||
68 | protected IPEndPoint m_internalEndPoint; | 68 | protected IPEndPoint m_internalEndPoint; |
69 | protected uint? m_regionLocX; | 69 | protected uint? m_regionLocX; |
70 | protected uint? m_regionLocY; | 70 | protected uint? m_regionLocY; |
71 | protected uint m_remotingPort; | 71 | protected uint m_remotingPort; |
72 | public LLUUID RegionID = LLUUID.Zero; | 72 | public LLUUID RegionID = LLUUID.Zero; |
73 | public string RemotingAddress; | 73 | public string RemotingAddress; |
74 | 74 | ||
@@ -404,11 +404,11 @@ namespace OpenSim.Framework | |||
404 | configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | 404 | configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, |
405 | "(Sandbox Mode Only)Password for Master Avatar account", | 405 | "(Sandbox Mode Only)Password for Master Avatar account", |
406 | MasterAvatarSandboxPassword, true); | 406 | MasterAvatarSandboxPassword, true); |
407 | configMember.addConfigurationOption("lastmap_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, | 407 | configMember.addConfigurationOption("lastmap_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, |
408 | "Last Map UUID", lastMapUUID.ToString(), true); | 408 | "Last Map UUID", lastMapUUID.ToString(), true); |
409 | configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, | 409 | configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, |
410 | "Last Map Refresh", Util.UnixTimeSinceEpoch().ToString(), true); | 410 | "Last Map Refresh", Util.UnixTimeSinceEpoch().ToString(), true); |
411 | 411 | ||
412 | } | 412 | } |
413 | 413 | ||
414 | public void loadConfigurationOptions() | 414 | public void loadConfigurationOptions() |
@@ -454,15 +454,14 @@ namespace OpenSim.Framework | |||
454 | shouldMasterAvatarDetailsBeAsked); | 454 | shouldMasterAvatarDetailsBeAsked); |
455 | configMember.addConfigurationOption("lastmap_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, | 455 | configMember.addConfigurationOption("lastmap_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, |
456 | "Last Map UUID", lastMapUUID.ToString(), true); | 456 | "Last Map UUID", lastMapUUID.ToString(), true); |
457 | 457 | ||
458 | configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, | 458 | configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, |
459 | "Last Map Refresh", Util.UnixTimeSinceEpoch().ToString(), true); | 459 | "Last Map Refresh", Util.UnixTimeSinceEpoch().ToString(), true); |
460 | |||
461 | } | 460 | } |
462 | 461 | ||
463 | public bool shouldMasterAvatarDetailsBeAsked(string configuration_key) | 462 | public bool shouldMasterAvatarDetailsBeAsked(string configuration_key) |
464 | { | 463 | { |
465 | if (MasterAvatarAssignedUUID == LLUUID.Zero) | 464 | return MasterAvatarAssignedUUID == LLUUID.Zero; |
466 | { | 465 | { |
467 | return true; | 466 | return true; |
468 | } | 467 | } |