aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/RegionInfo.cs32
1 files changed, 16 insertions, 16 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 7d71499..a7315f5 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -303,7 +303,7 @@ namespace OpenSim.Framework
303 private int m_physPrimMax = 0; 303 private int m_physPrimMax = 0;
304 private bool m_clampPrimSize = false; 304 private bool m_clampPrimSize = false;
305 private int m_objectCapacity = 0; 305 private int m_objectCapacity = 0;
306 private string m_productName = String.Empty; 306 private string m_regionType = String.Empty;
307 307
308 308
309 // Apparently, we're applying the same estatesettings regardless of whether it's local or remote. 309 // Apparently, we're applying the same estatesettings regardless of whether it's local or remote.
@@ -479,9 +479,9 @@ namespace OpenSim.Framework
479 get { return (byte)Util.ConvertMaturityToAccessLevel((uint)RegionSettings.Maturity); } 479 get { return (byte)Util.ConvertMaturityToAccessLevel((uint)RegionSettings.Maturity); }
480 } 480 }
481 481
482 public string ProductName 482 public string RegionType
483 { 483 {
484 get { return m_productName; } 484 get { return m_regionType; }
485 } 485 }
486 486
487 public void SetEndPoint(string ipaddr, int port) 487 public void SetEndPoint(string ipaddr, int port)
@@ -660,7 +660,7 @@ namespace OpenSim.Framework
660 660
661 MasterAvatarAssignedUUID = new UUID(masterAvatarUUID); 661 MasterAvatarAssignedUUID = new UUID(masterAvatarUUID);
662 662
663 m_productName = config.GetString("ProductName", String.Empty); 663 m_regionType = config.GetString("RegionType", String.Empty);
664 664
665 // Prim stuff 665 // Prim stuff
666 // 666 //
@@ -728,8 +728,8 @@ namespace OpenSim.Framework
728 if (ScopeID != UUID.Zero) 728 if (ScopeID != UUID.Zero)
729 config.Set("ScopeID", ScopeID.ToString()); 729 config.Set("ScopeID", ScopeID.ToString());
730 730
731 if (ProductName != String.Empty) 731 if (RegionType != String.Empty)
732 config.Set("ProductName", ProductName); 732 config.Set("RegionType", RegionType);
733 } 733 }
734 734
735 public bool ignoreIncomingConfiguration(string configuration_key, object configuration_result) 735 public bool ignoreIncomingConfiguration(string configuration_key, object configuration_result)
@@ -820,8 +820,8 @@ namespace OpenSim.Framework
820 configMember.addConfigurationOption("scope_id", ConfigurationOption.ConfigurationTypes.TYPE_UUID, 820 configMember.addConfigurationOption("scope_id", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
821 "Scope ID for this region", ScopeID.ToString(), true); 821 "Scope ID for this region", ScopeID.ToString(), true);
822 822
823 configMember.addConfigurationOption("product_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 823 configMember.addConfigurationOption("region_type", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
824 "Product Name", String.Empty, true); 824 "Region Type", String.Empty, true);
825 } 825 }
826 826
827 public void loadConfigurationOptions() 827 public void loadConfigurationOptions()
@@ -886,8 +886,8 @@ namespace OpenSim.Framework
886 configMember.addConfigurationOption("scope_id", ConfigurationOption.ConfigurationTypes.TYPE_UUID, 886 configMember.addConfigurationOption("scope_id", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
887 "Scope ID for this region", UUID.Zero.ToString(), true); 887 "Scope ID for this region", UUID.Zero.ToString(), true);
888 888
889 configMember.addConfigurationOption("product_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 889 configMember.addConfigurationOption("region_type", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
890 "Product Name", String.Empty, true); 890 "Region Type", String.Empty, true);
891 } 891 }
892 892
893 public bool shouldMasterAvatarDetailsBeAsked(string configuration_key) 893 public bool shouldMasterAvatarDetailsBeAsked(string configuration_key)
@@ -968,8 +968,8 @@ namespace OpenSim.Framework
968 case "scope_id": 968 case "scope_id":
969 ScopeID = (UUID)configuration_result; 969 ScopeID = (UUID)configuration_result;
970 break; 970 break;
971 case "product_name": 971 case "region_type":
972 m_productName = (string)configuration_result; 972 m_regionType = (string)configuration_result;
973 break; 973 break;
974 } 974 }
975 975
@@ -1006,8 +1006,8 @@ namespace OpenSim.Framework
1006 args["allow_alt_ports"] = OSD.FromBoolean(m_allow_alternate_ports); 1006 args["allow_alt_ports"] = OSD.FromBoolean(m_allow_alternate_ports);
1007 if ((proxyUrl != null) && !proxyUrl.Equals("")) 1007 if ((proxyUrl != null) && !proxyUrl.Equals(""))
1008 args["proxy_url"] = OSD.FromString(proxyUrl); 1008 args["proxy_url"] = OSD.FromString(proxyUrl);
1009 if (ProductName != String.Empty) 1009 if (RegionType != String.Empty)
1010 args["product_name"] = OSD.FromString(ProductName); 1010 args["region_type"] = OSD.FromString(RegionType);
1011 1011
1012 return args; 1012 return args;
1013 } 1013 }
@@ -1055,8 +1055,8 @@ namespace OpenSim.Framework
1055 m_allow_alternate_ports = args["allow_alt_ports"].AsBoolean(); 1055 m_allow_alternate_ports = args["allow_alt_ports"].AsBoolean();
1056 if (args["proxy_url"] != null) 1056 if (args["proxy_url"] != null)
1057 proxyUrl = args["proxy_url"].AsString(); 1057 proxyUrl = args["proxy_url"].AsString();
1058 if (args["product_name"] != null) 1058 if (args["region_type"] != null)
1059 m_productName = args["product_name"].AsString(); 1059 m_regionType = args["region_type"].AsString();
1060 } 1060 }
1061 1061
1062 public static RegionInfo Create(UUID regionID, string regionName, uint regX, uint regY, string externalHostName, uint httpPort, uint simPort, uint remotingPort, string serverURI) 1062 public static RegionInfo Create(UUID regionID, string regionName, uint regX, uint regY, string externalHostName, uint httpPort, uint simPort, uint remotingPort, string serverURI)