diff options
author | mingchen | 2007-08-03 00:14:11 +0000 |
---|---|---|
committer | mingchen | 2007-08-03 00:14:11 +0000 |
commit | 1c68c7a37f60983f61cddc2bf8b1e9b793c4fd2b (patch) | |
tree | 758b28c9bc755223c679a5bdada137e0ea4ffeb8 /OpenSim/Framework/General/Types/RegionInfo.cs | |
parent | Fixes flying glitch (hang) when crossing region boundaries (diff) | |
download | opensim-SC_OLD-1c68c7a37f60983f61cddc2bf8b1e9b793c4fd2b.zip opensim-SC_OLD-1c68c7a37f60983f61cddc2bf8b1e9b793c4fd2b.tar.gz opensim-SC_OLD-1c68c7a37f60983f61cddc2bf8b1e9b793c4fd2b.tar.bz2 opensim-SC_OLD-1c68c7a37f60983f61cddc2bf8b1e9b793c4fd2b.tar.xz |
*Estate settings are now saved in their own configuration file called estate_settings.xml using the configuration system.
Diffstat (limited to 'OpenSim/Framework/General/Types/RegionInfo.cs')
-rw-r--r-- | OpenSim/Framework/General/Types/RegionInfo.cs | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/OpenSim/Framework/General/Types/RegionInfo.cs b/OpenSim/Framework/General/Types/RegionInfo.cs index ef05534..297e324 100644 --- a/OpenSim/Framework/General/Types/RegionInfo.cs +++ b/OpenSim/Framework/General/Types/RegionInfo.cs | |||
@@ -172,8 +172,6 @@ namespace OpenSim.Framework.Types | |||
172 | configMember.addConfigurationOption("internal_ip_address", ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS, "Internal IP Address for incoming UDP client connections", "0.0.0.0", false); | 172 | configMember.addConfigurationOption("internal_ip_address", ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS, "Internal IP Address for incoming UDP client connections", "0.0.0.0", false); |
173 | configMember.addConfigurationOption("internal_ip_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "Internal IP Port for incoming UDP client connections", "9000", false); | 173 | configMember.addConfigurationOption("internal_ip_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "Internal IP Port for incoming UDP client connections", "9000", false); |
174 | configMember.addConfigurationOption("external_host_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "External Host Name", "127.0.0.1", false); | 174 | configMember.addConfigurationOption("external_host_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "External Host Name", "127.0.0.1", false); |
175 | configMember.addConfigurationOption("terrain_file", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Terrain File", "default.r32", false); | ||
176 | configMember.addConfigurationOption("terrain_multiplier", ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE, "Terrain Height Multiplier", "60.0", false); | ||
177 | configMember.addConfigurationOption("master_avatar_first", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "First Name of Master Avatar", "Test", false); | 175 | configMember.addConfigurationOption("master_avatar_first", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "First Name of Master Avatar", "Test", false); |
178 | configMember.addConfigurationOption("master_avatar_last", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Last Name of Master Avatar", "User", false); | 176 | configMember.addConfigurationOption("master_avatar_last", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Last Name of Master Avatar", "User", false); |
179 | configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "(Sandbox Mode Only)Password for Master Avatar account", "test", false); | 177 | configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "(Sandbox Mode Only)Password for Master Avatar account", "test", false); |
@@ -216,12 +214,6 @@ namespace OpenSim.Framework.Types | |||
216 | this.m_externalHostName = Util.GetLocalHost().ToString(); | 214 | this.m_externalHostName = Util.GetLocalHost().ToString(); |
217 | } | 215 | } |
218 | break; | 216 | break; |
219 | case "terrain_file": | ||
220 | this.estateSettings.terrainFile = (string)configuration_result; | ||
221 | break; | ||
222 | case "terrain_multiplier": | ||
223 | this.estateSettings.terrainMultiplier = (double)configuration_result; | ||
224 | break; | ||
225 | case "master_avatar_first": | 217 | case "master_avatar_first": |
226 | this.MasterAvatarFirstName = (string)configuration_result; | 218 | this.MasterAvatarFirstName = (string)configuration_result; |
227 | break; | 219 | break; |