aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionInfo.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/RegionInfo.cs')
-rw-r--r--OpenSim/Framework/RegionInfo.cs30
1 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 8f754a5..99e97e8 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -376,7 +376,7 @@ namespace OpenSim.Framework
376 } 376 }
377 377
378 public string MaptileStaticFile { get; private set; } 378 public string MaptileStaticFile { get; private set; }
379 379
380 /// <summary> 380 /// <summary>
381 /// The port by which http communication occurs with the region (most noticeably, CAPS communication) 381 /// The port by which http communication occurs with the region (most noticeably, CAPS communication)
382 /// </summary> 382 /// </summary>
@@ -389,17 +389,17 @@ namespace OpenSim.Framework
389 /// <summary> 389 /// <summary>
390 /// A well-formed URI for the host region server (namely "http://" + ExternalHostName) 390 /// A well-formed URI for the host region server (namely "http://" + ExternalHostName)
391 /// </summary> 391 /// </summary>
392 392
393 public string ServerURI 393 public string ServerURI
394 { 394 {
395 get { 395 get {
396 if ( m_serverURI != string.Empty ) { 396 if ( m_serverURI != string.Empty ) {
397 return m_serverURI; 397 return m_serverURI;
398 } else { 398 } else {
399 return "http://" + m_externalHostName + ":" + m_httpPort + "/"; 399 return "http://" + m_externalHostName + ":" + m_httpPort + "/";
400 } 400 }
401 } 401 }
402 set { 402 set {
403 if ( value.EndsWith("/") ) { 403 if ( value.EndsWith("/") ) {
404 m_serverURI = value; 404 m_serverURI = value;
405 } else { 405 } else {
@@ -749,10 +749,10 @@ namespace OpenSim.Framework
749 749
750 m_physPrimMax = config.GetInt("PhysicalPrimMax", 0); 750 m_physPrimMax = config.GetInt("PhysicalPrimMax", 0);
751 allKeys.Remove("PhysicalPrimMax"); 751 allKeys.Remove("PhysicalPrimMax");
752 752
753 m_clampPrimSize = config.GetBoolean("ClampPrimSize", false); 753 m_clampPrimSize = config.GetBoolean("ClampPrimSize", false);
754 allKeys.Remove("ClampPrimSize"); 754 allKeys.Remove("ClampPrimSize");
755 755
756 m_objectCapacity = config.GetInt("MaxPrims", 15000); 756 m_objectCapacity = config.GetInt("MaxPrims", 15000);
757 allKeys.Remove("MaxPrims"); 757 allKeys.Remove("MaxPrims");
758 758
@@ -766,12 +766,12 @@ namespace OpenSim.Framework
766 string mapTileStaticUUID = config.GetString("MaptileStaticUUID", UUID.Zero.ToString()); 766 string mapTileStaticUUID = config.GetString("MaptileStaticUUID", UUID.Zero.ToString());
767 if (UUID.TryParse(mapTileStaticUUID.Trim(), out m_maptileStaticUUID)) 767 if (UUID.TryParse(mapTileStaticUUID.Trim(), out m_maptileStaticUUID))
768 { 768 {
769 config.Set("MaptileStaticUUID", m_maptileStaticUUID.ToString()); 769 config.Set("MaptileStaticUUID", m_maptileStaticUUID.ToString());
770 } 770 }
771 771
772 MaptileStaticFile = config.GetString("MaptileStaticFile", String.Empty); 772 MaptileStaticFile = config.GetString("MaptileStaticFile", String.Empty);
773 allKeys.Remove("MaptileStaticFile"); 773 allKeys.Remove("MaptileStaticFile");
774 774
775 #endregion 775 #endregion
776 776
777 AgentCapacity = config.GetInt("MaxAgents", 100); 777 AgentCapacity = config.GetInt("MaxAgents", 100);
@@ -919,10 +919,10 @@ namespace OpenSim.Framework
919 919
920 if (m_physPrimMin > 0) 920 if (m_physPrimMin > 0)
921 config.Set("PhysicalPrimMax", m_physPrimMin); 921 config.Set("PhysicalPrimMax", m_physPrimMin);
922 922
923 if (m_physPrimMax > 0) 923 if (m_physPrimMax > 0)
924 config.Set("PhysicalPrimMax", m_physPrimMax); 924 config.Set("PhysicalPrimMax", m_physPrimMax);
925 925
926 config.Set("ClampPrimSize", m_clampPrimSize.ToString()); 926 config.Set("ClampPrimSize", m_clampPrimSize.ToString());
927 927
928 if (m_objectCapacity > 0) 928 if (m_objectCapacity > 0)
@@ -1038,7 +1038,7 @@ namespace OpenSim.Framework
1038 1038
1039 configMember.addConfigurationOption("region_type", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 1039 configMember.addConfigurationOption("region_type", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
1040 "Free form string describing the type of region", String.Empty, true); 1040 "Free form string describing the type of region", String.Empty, true);
1041 1041
1042 configMember.addConfigurationOption("region_static_maptile", ConfigurationOption.ConfigurationTypes.TYPE_UUID, 1042 configMember.addConfigurationOption("region_static_maptile", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
1043 "UUID of a texture to use as the map for this region", m_maptileStaticUUID.ToString(), true); 1043 "UUID of a texture to use as the map for this region", m_maptileStaticUUID.ToString(), true);
1044 } 1044 }
@@ -1090,7 +1090,7 @@ namespace OpenSim.Framework
1090 1090
1091 configMember.addConfigurationOption("object_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32, 1091 configMember.addConfigurationOption("object_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
1092 "Max objects this sim will hold", "15000", true); 1092 "Max objects this sim will hold", "15000", true);
1093 1093
1094 configMember.addConfigurationOption("agent_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32, 1094 configMember.addConfigurationOption("agent_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
1095 "Max avatars this sim will hold", "100", true); 1095 "Max avatars this sim will hold", "100", true);
1096 1096
@@ -1307,8 +1307,8 @@ namespace OpenSim.Framework
1307 kvp["http_port"] = HttpPort.ToString(); 1307 kvp["http_port"] = HttpPort.ToString();
1308 kvp["internal_ip_address"] = InternalEndPoint.Address.ToString(); 1308 kvp["internal_ip_address"] = InternalEndPoint.Address.ToString();
1309 kvp["internal_port"] = InternalEndPoint.Port.ToString(); 1309 kvp["internal_port"] = InternalEndPoint.Port.ToString();
1310 // TODO: Remove in next major version 1310 // TODO: Remove in next major version
1311 kvp["alternate_ports"] = "False"; 1311 kvp["alternate_ports"] = "False";
1312 kvp["server_uri"] = ServerURI; 1312 kvp["server_uri"] = ServerURI;
1313 1313
1314 return kvp; 1314 return kvp;