aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/EstateSettings.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/EstateSettings.cs')
-rw-r--r--OpenSim/Framework/EstateSettings.cs18
1 files changed, 18 insertions, 0 deletions
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index f27c1c3..42154e9 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -486,6 +486,19 @@ namespace OpenSim.Framework
486 } 486 }
487 } 487 }
488 488
489 // Estate name
490 private string m_estateName;
491
492 public string estateName
493 {
494 get { return m_estateName; }
495 set
496 {
497 m_estateName = value;
498 configMember.forceSetConfigurationOption("estate_name", m_estateName.ToString());
499 }
500 }
501
489 private LLUUID m_estateManager0; 502 private LLUUID m_estateManager0;
490 private LLUUID m_estateManager1; 503 private LLUUID m_estateManager1;
491 private LLUUID m_estateManager2; 504 private LLUUID m_estateManager2;
@@ -835,6 +848,8 @@ namespace OpenSim.Framework
835 configMember.addConfigurationOption("terrain_image_id", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 848 configMember.addConfigurationOption("terrain_image_id", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
836 String.Empty, "00000000-0000-0000-0000-000000000000", true); 849 String.Empty, "00000000-0000-0000-0000-000000000000", true);
837 850
851 configMember.addConfigurationOption("estate_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
852 String.Empty, "TestEstate", true);
838 configMember.addConfigurationOption("estate_manager_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 853 configMember.addConfigurationOption("estate_manager_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
839 String.Empty, "00000000-0000-0000-0000-000000000000", true); 854 String.Empty, "00000000-0000-0000-0000-000000000000", true);
840 configMember.addConfigurationOption("estate_manager_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 855 configMember.addConfigurationOption("estate_manager_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
@@ -966,6 +981,9 @@ namespace OpenSim.Framework
966 case "terrain_file": 981 case "terrain_file":
967 m_terrainFile = (string) configuration_result; 982 m_terrainFile = (string) configuration_result;
968 break; 983 break;
984 case "estate_name":
985 m_estateName = (string) configuration_result;
986 break;
969 case "terrain_multiplier": 987 case "terrain_multiplier":
970 m_terrainMultiplier = Convert.ToDouble(configuration_result); 988 m_terrainMultiplier = Convert.ToDouble(configuration_result);
971 break; 989 break;