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