aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/RegionInfo.cs24
-rw-r--r--bin/RegionConfig.ini.example6
2 files changed, 29 insertions, 1 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index d3a5357..7d71499 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -303,6 +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 307
307 308
308 // 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.
@@ -478,6 +479,11 @@ namespace OpenSim.Framework
478 get { return (byte)Util.ConvertMaturityToAccessLevel((uint)RegionSettings.Maturity); } 479 get { return (byte)Util.ConvertMaturityToAccessLevel((uint)RegionSettings.Maturity); }
479 } 480 }
480 481
482 public string ProductName
483 {
484 get { return m_productName; }
485 }
486
481 public void SetEndPoint(string ipaddr, int port) 487 public void SetEndPoint(string ipaddr, int port)
482 { 488 {
483 IPAddress tmpIP = IPAddress.Parse(ipaddr); 489 IPAddress tmpIP = IPAddress.Parse(ipaddr);
@@ -654,8 +660,8 @@ namespace OpenSim.Framework
654 660
655 MasterAvatarAssignedUUID = new UUID(masterAvatarUUID); 661 MasterAvatarAssignedUUID = new UUID(masterAvatarUUID);
656 662
663 m_productName = config.GetString("ProductName", String.Empty);
657 664
658
659 // Prim stuff 665 // Prim stuff
660 // 666 //
661 m_nonphysPrimMax = config.GetInt("NonphysicalPrimMax", 256); 667 m_nonphysPrimMax = config.GetInt("NonphysicalPrimMax", 256);
@@ -721,6 +727,9 @@ namespace OpenSim.Framework
721 727
722 if (ScopeID != UUID.Zero) 728 if (ScopeID != UUID.Zero)
723 config.Set("ScopeID", ScopeID.ToString()); 729 config.Set("ScopeID", ScopeID.ToString());
730
731 if (ProductName != String.Empty)
732 config.Set("ProductName", ProductName);
724 } 733 }
725 734
726 public bool ignoreIncomingConfiguration(string configuration_key, object configuration_result) 735 public bool ignoreIncomingConfiguration(string configuration_key, object configuration_result)
@@ -810,6 +819,9 @@ namespace OpenSim.Framework
810 819
811 configMember.addConfigurationOption("scope_id", ConfigurationOption.ConfigurationTypes.TYPE_UUID, 820 configMember.addConfigurationOption("scope_id", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
812 "Scope ID for this region", ScopeID.ToString(), true); 821 "Scope ID for this region", ScopeID.ToString(), true);
822
823 configMember.addConfigurationOption("product_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
824 "Product Name", String.Empty, true);
813 } 825 }
814 826
815 public void loadConfigurationOptions() 827 public void loadConfigurationOptions()
@@ -873,6 +885,9 @@ namespace OpenSim.Framework
873 885
874 configMember.addConfigurationOption("scope_id", ConfigurationOption.ConfigurationTypes.TYPE_UUID, 886 configMember.addConfigurationOption("scope_id", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
875 "Scope ID for this region", UUID.Zero.ToString(), true); 887 "Scope ID for this region", UUID.Zero.ToString(), true);
888
889 configMember.addConfigurationOption("product_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
890 "Product Name", String.Empty, true);
876 } 891 }
877 892
878 public bool shouldMasterAvatarDetailsBeAsked(string configuration_key) 893 public bool shouldMasterAvatarDetailsBeAsked(string configuration_key)
@@ -953,6 +968,9 @@ namespace OpenSim.Framework
953 case "scope_id": 968 case "scope_id":
954 ScopeID = (UUID)configuration_result; 969 ScopeID = (UUID)configuration_result;
955 break; 970 break;
971 case "product_name":
972 m_productName = (string)configuration_result;
973 break;
956 } 974 }
957 975
958 return true; 976 return true;
@@ -988,6 +1006,8 @@ namespace OpenSim.Framework
988 args["allow_alt_ports"] = OSD.FromBoolean(m_allow_alternate_ports); 1006 args["allow_alt_ports"] = OSD.FromBoolean(m_allow_alternate_ports);
989 if ((proxyUrl != null) && !proxyUrl.Equals("")) 1007 if ((proxyUrl != null) && !proxyUrl.Equals(""))
990 args["proxy_url"] = OSD.FromString(proxyUrl); 1008 args["proxy_url"] = OSD.FromString(proxyUrl);
1009 if (ProductName != String.Empty)
1010 args["product_name"] = OSD.FromString(ProductName);
991 1011
992 return args; 1012 return args;
993 } 1013 }
@@ -1035,6 +1055,8 @@ namespace OpenSim.Framework
1035 m_allow_alternate_ports = args["allow_alt_ports"].AsBoolean(); 1055 m_allow_alternate_ports = args["allow_alt_ports"].AsBoolean();
1036 if (args["proxy_url"] != null) 1056 if (args["proxy_url"] != null)
1037 proxyUrl = args["proxy_url"].AsString(); 1057 proxyUrl = args["proxy_url"].AsString();
1058 if (args["product_name"] != null)
1059 m_productName = args["product_name"].AsString();
1038 } 1060 }
1039 1061
1040 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)
diff --git a/bin/RegionConfig.ini.example b/bin/RegionConfig.ini.example
index 0404168..2767379 100644
--- a/bin/RegionConfig.ini.example
+++ b/bin/RegionConfig.ini.example
@@ -45,3 +45,9 @@ MasterAvatarUUID = "00000000-0000-0000-0000-000000000000"
45; * 45; *
46 46
47; ScopeID = "00000000-0000-0000-0000-000000000000" 47; ScopeID = "00000000-0000-0000-0000-000000000000"
48
49; *
50; * Product name (used in search from viewer 1.23
51; *
52
53; ProductName = "Mainland"