diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 12c58c3..08d5398 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -97,9 +97,9 @@ namespace OpenSim.Framework | |||
97 | 97 | ||
98 | [Serializable] | 98 | [Serializable] |
99 | public class SimpleRegionInfo | 99 | public class SimpleRegionInfo |
100 | { | 100 | { |
101 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 101 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
102 | 102 | ||
103 | /// <summary> | 103 | /// <summary> |
104 | /// The port by which http communication occurs with the region (most noticeably, CAPS communication) | 104 | /// The port by which http communication occurs with the region (most noticeably, CAPS communication) |
105 | /// </summary> | 105 | /// </summary> |
@@ -344,7 +344,7 @@ namespace OpenSim.Framework | |||
344 | public string proxyUrl = ""; | 344 | public string proxyUrl = ""; |
345 | public int ProxyOffset = 0; | 345 | public int ProxyOffset = 0; |
346 | public string regionSecret = UUID.Random().ToString(); | 346 | public string regionSecret = UUID.Random().ToString(); |
347 | 347 | ||
348 | public string osSecret; | 348 | public string osSecret; |
349 | 349 | ||
350 | public UUID lastMapUUID = UUID.Zero; | 350 | public UUID lastMapUUID = UUID.Zero; |
@@ -699,7 +699,7 @@ namespace OpenSim.Framework | |||
699 | 699 | ||
700 | RegionID = new UUID(regionUUID); | 700 | RegionID = new UUID(regionUUID); |
701 | originRegionID = RegionID; // What IS this?! | 701 | originRegionID = RegionID; // What IS this?! |
702 | 702 | ||
703 | RegionName = name; | 703 | RegionName = name; |
704 | string location = config.GetString("Location", String.Empty); | 704 | string location = config.GetString("Location", String.Empty); |
705 | 705 | ||
@@ -720,7 +720,7 @@ namespace OpenSim.Framework | |||
720 | 720 | ||
721 | // Internal IP | 721 | // Internal IP |
722 | IPAddress address; | 722 | IPAddress address; |
723 | 723 | ||
724 | if (config.Contains("InternalAddress")) | 724 | if (config.Contains("InternalAddress")) |
725 | { | 725 | { |
726 | address = IPAddress.Parse(config.GetString("InternalAddress", String.Empty)); | 726 | address = IPAddress.Parse(config.GetString("InternalAddress", String.Empty)); |
@@ -774,7 +774,7 @@ namespace OpenSim.Framework | |||
774 | { | 774 | { |
775 | m_externalHostName = Util.GetLocalHost().ToString(); | 775 | m_externalHostName = Util.GetLocalHost().ToString(); |
776 | m_log.InfoFormat( | 776 | m_log.InfoFormat( |
777 | "[REGIONINFO]: Resolving SYSTEMIP to {0} for external hostname of region {1}", | 777 | "[REGIONINFO]: Resolving SYSTEMIP to {0} for external hostname of region {1}", |
778 | m_externalHostName, name); | 778 | m_externalHostName, name); |
779 | } | 779 | } |
780 | else | 780 | else |
@@ -909,16 +909,16 @@ namespace OpenSim.Framework | |||
909 | 909 | ||
910 | configMember.addConfigurationOption("nonphysical_prim_max", ConfigurationOption.ConfigurationTypes.TYPE_INT32, | 910 | configMember.addConfigurationOption("nonphysical_prim_max", ConfigurationOption.ConfigurationTypes.TYPE_INT32, |
911 | "Maximum size for nonphysical prims", m_nonphysPrimMax.ToString(), true); | 911 | "Maximum size for nonphysical prims", m_nonphysPrimMax.ToString(), true); |
912 | 912 | ||
913 | configMember.addConfigurationOption("physical_prim_max", ConfigurationOption.ConfigurationTypes.TYPE_INT32, | 913 | configMember.addConfigurationOption("physical_prim_max", ConfigurationOption.ConfigurationTypes.TYPE_INT32, |
914 | "Maximum size for physical prims", m_physPrimMax.ToString(), true); | 914 | "Maximum size for physical prims", m_physPrimMax.ToString(), true); |
915 | 915 | ||
916 | configMember.addConfigurationOption("clamp_prim_size", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, | 916 | configMember.addConfigurationOption("clamp_prim_size", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, |
917 | "Clamp prims to max size", m_clampPrimSize.ToString(), true); | 917 | "Clamp prims to max size", m_clampPrimSize.ToString(), true); |
918 | 918 | ||
919 | configMember.addConfigurationOption("object_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32, | 919 | configMember.addConfigurationOption("object_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32, |
920 | "Max objects this sim will hold", m_objectCapacity.ToString(), true); | 920 | "Max objects this sim will hold", m_objectCapacity.ToString(), true); |
921 | 921 | ||
922 | configMember.addConfigurationOption("scope_id", ConfigurationOption.ConfigurationTypes.TYPE_UUID, | 922 | configMember.addConfigurationOption("scope_id", ConfigurationOption.ConfigurationTypes.TYPE_UUID, |
923 | "Scope ID for this region", ScopeID.ToString(), true); | 923 | "Scope ID for this region", ScopeID.ToString(), true); |
924 | 924 | ||
@@ -956,16 +956,16 @@ namespace OpenSim.Framework | |||
956 | 956 | ||
957 | configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, | 957 | configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, |
958 | "Last Map Refresh", Util.UnixTimeSinceEpoch().ToString(), true); | 958 | "Last Map Refresh", Util.UnixTimeSinceEpoch().ToString(), true); |
959 | 959 | ||
960 | configMember.addConfigurationOption("nonphysical_prim_max", ConfigurationOption.ConfigurationTypes.TYPE_INT32, | 960 | configMember.addConfigurationOption("nonphysical_prim_max", ConfigurationOption.ConfigurationTypes.TYPE_INT32, |
961 | "Maximum size for nonphysical prims", "0", true); | 961 | "Maximum size for nonphysical prims", "0", true); |
962 | 962 | ||
963 | configMember.addConfigurationOption("physical_prim_max", ConfigurationOption.ConfigurationTypes.TYPE_INT32, | 963 | configMember.addConfigurationOption("physical_prim_max", ConfigurationOption.ConfigurationTypes.TYPE_INT32, |
964 | "Maximum size for physical prims", "0", true); | 964 | "Maximum size for physical prims", "0", true); |
965 | 965 | ||
966 | configMember.addConfigurationOption("clamp_prim_size", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, | 966 | configMember.addConfigurationOption("clamp_prim_size", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, |
967 | "Clamp prims to max size", "false", true); | 967 | "Clamp prims to max size", "false", true); |
968 | 968 | ||
969 | configMember.addConfigurationOption("object_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32, | 969 | configMember.addConfigurationOption("object_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32, |
970 | "Max objects this sim will hold", "0", true); | 970 | "Max objects this sim will hold", "0", true); |
971 | 971 | ||