From 67e12b95ea7b68f4904a7484d77ecfd787d16d0c Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Tue, 30 Oct 2007 09:05:31 +0000 Subject: * Optimized usings * Shortened type references * Removed redundant 'this' qualifier --- OpenSim/Framework/General/EstateSettings.cs | 428 +++++++++++++--------------- 1 file changed, 199 insertions(+), 229 deletions(-) (limited to 'OpenSim/Framework/General/EstateSettings.cs') diff --git a/OpenSim/Framework/General/EstateSettings.cs b/OpenSim/Framework/General/EstateSettings.cs index 3e99424..c70b6ca 100644 --- a/OpenSim/Framework/General/EstateSettings.cs +++ b/OpenSim/Framework/General/EstateSettings.cs @@ -25,24 +25,20 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */ +using System; using System.IO; using libsecondlife; -using OpenSim.Framework; -using System.Globalization; namespace OpenSim.Framework { public class EstateSettings { - //Settings to this island private float m_billableFactor; + public float billableFactor { - get - { - return m_billableFactor; - } + get { return m_billableFactor; } set { m_billableFactor = value; @@ -52,12 +48,10 @@ namespace OpenSim.Framework private uint m_estateID; + public uint estateID { - get - { - return m_estateID; - } + get { return m_estateID; } set { m_estateID = value; @@ -67,12 +61,10 @@ namespace OpenSim.Framework private uint m_parentEstateID; + public uint parentEstateID { - get - { - return m_parentEstateID; - } + get { return m_parentEstateID; } set { m_parentEstateID = value; @@ -81,12 +73,10 @@ namespace OpenSim.Framework } private byte m_maxAgents; + public byte maxAgents { - get - { - return m_maxAgents; - } + get { return m_maxAgents; } set { m_maxAgents = value; @@ -95,12 +85,10 @@ namespace OpenSim.Framework } private float m_objectBonusFactor; + public float objectBonusFactor { - get - { - return m_objectBonusFactor; - } + get { return m_objectBonusFactor; } set { m_objectBonusFactor = value; @@ -109,12 +97,10 @@ namespace OpenSim.Framework } private int m_redirectGridX; + public int redirectGridX { - get - { - return m_redirectGridX; - } + get { return m_redirectGridX; } set { m_redirectGridX = value; @@ -123,12 +109,10 @@ namespace OpenSim.Framework } private int m_redirectGridY; + public int redirectGridY { - get - { - return m_redirectGridY; - } + get { return m_redirectGridY; } set { m_redirectGridY = value; @@ -137,12 +121,10 @@ namespace OpenSim.Framework } private Simulator.RegionFlags m_regionFlags; + public Simulator.RegionFlags regionFlags { - get - { - return m_regionFlags; - } + get { return m_regionFlags; } set { m_regionFlags = value; @@ -152,12 +134,10 @@ namespace OpenSim.Framework private Simulator.SimAccess m_simAccess; + public Simulator.SimAccess simAccess { - get - { - return m_simAccess; - } + get { return m_simAccess; } set { m_simAccess = value; @@ -166,12 +146,10 @@ namespace OpenSim.Framework } private float m_sunHour; + public float sunHour { - get - { - return m_sunHour; - } + get { return m_sunHour; } set { m_sunHour = value; @@ -180,12 +158,10 @@ namespace OpenSim.Framework } private float m_terrainRaiseLimit; + public float terrainRaiseLimit { - get - { - return m_terrainRaiseLimit; - } + get { return m_terrainRaiseLimit; } set { m_terrainRaiseLimit = value; @@ -194,12 +170,10 @@ namespace OpenSim.Framework } private float m_terrainLowerLimit; + public float terrainLowerLimit { - get - { - return m_terrainLowerLimit; - } + get { return m_terrainLowerLimit; } set { m_terrainLowerLimit = value; @@ -208,12 +182,10 @@ namespace OpenSim.Framework } private bool m_useFixedSun; + public bool useFixedSun { - get - { - return m_useFixedSun; - } + get { return m_useFixedSun; } set { m_useFixedSun = value; @@ -223,12 +195,10 @@ namespace OpenSim.Framework private int m_pricePerMeter; + public int pricePerMeter { - get - { - return m_pricePerMeter; - } + get { return m_pricePerMeter; } set { m_pricePerMeter = value; @@ -238,12 +208,10 @@ namespace OpenSim.Framework private ushort m_regionWaterHeight; + public ushort regionWaterHeight { - get - { - return m_regionWaterHeight; - } + get { return m_regionWaterHeight; } set { m_regionWaterHeight = value; @@ -253,12 +221,10 @@ namespace OpenSim.Framework private bool m_regionAllowTerraform; + public bool regionAllowTerraform { - get - { - return m_regionAllowTerraform; - } + get { return m_regionAllowTerraform; } set { m_regionAllowTerraform = value; @@ -266,16 +232,14 @@ namespace OpenSim.Framework } } - + // Region Information // Low resolution 'base' textures. No longer used. private LLUUID m_terrainBase0; + public LLUUID terrainBase0 { - get - { - return m_terrainBase0; - } + get { return m_terrainBase0; } set { m_terrainBase0 = value; @@ -284,12 +248,10 @@ namespace OpenSim.Framework } private LLUUID m_terrainBase1; + public LLUUID terrainBase1 { - get - { - return m_terrainBase1; - } + get { return m_terrainBase1; } set { m_terrainBase1 = value; @@ -298,12 +260,10 @@ namespace OpenSim.Framework } private LLUUID m_terrainBase2; + public LLUUID terrainBase2 { - get - { - return m_terrainBase2; - } + get { return m_terrainBase2; } set { m_terrainBase2 = value; @@ -312,12 +272,10 @@ namespace OpenSim.Framework } private LLUUID m_terrainBase3; + public LLUUID terrainBase3 { - get - { - return m_terrainBase3; - } + get { return m_terrainBase3; } set { m_terrainBase3 = value; @@ -328,53 +286,46 @@ namespace OpenSim.Framework // Higher resolution terrain textures private LLUUID m_terrainDetail0; + public LLUUID terrainDetail0 { - get - { - return m_terrainDetail0; - } + get { return m_terrainDetail0; } set { - m_terrainDetail0 = value; configMember.forceSetConfigurationOption("terrain_detail_0", m_terrainDetail0.ToString()); } } private LLUUID m_terrainDetail1; + public LLUUID terrainDetail1 { - get - { - return m_terrainDetail1; - } + get { return m_terrainDetail1; } set { m_terrainDetail1 = value; configMember.forceSetConfigurationOption("terrain_detail_1", m_terrainDetail1.ToString()); } } + private LLUUID m_terrainDetail2; + public LLUUID terrainDetail2 { - get - { - return m_terrainDetail2; - } + get { return m_terrainDetail2; } set { m_terrainDetail2 = value; configMember.forceSetConfigurationOption("terrain_detail_2", m_terrainDetail2.ToString()); } } + private LLUUID m_terrainDetail3; + public LLUUID terrainDetail3 { - get - { - return m_terrainDetail3; - } + get { return m_terrainDetail3; } set { m_terrainDetail3 = value; @@ -384,12 +335,10 @@ namespace OpenSim.Framework // First quad - each point is bilinearly interpolated at each meter of terrain private float m_terrainStartHeight0; + public float terrainStartHeight0 { - get - { - return m_terrainStartHeight0; - } + get { return m_terrainStartHeight0; } set { m_terrainStartHeight0 = value; @@ -399,12 +348,10 @@ namespace OpenSim.Framework private float m_terrainStartHeight1; + public float terrainStartHeight1 { - get - { - return m_terrainStartHeight1; - } + get { return m_terrainStartHeight1; } set { m_terrainStartHeight1 = value; @@ -413,12 +360,10 @@ namespace OpenSim.Framework } private float m_terrainStartHeight2; + public float terrainStartHeight2 { - get - { - return m_terrainStartHeight2; - } + get { return m_terrainStartHeight2; } set { m_terrainStartHeight2 = value; @@ -427,28 +372,25 @@ namespace OpenSim.Framework } private float m_terrainStartHeight3; + public float terrainStartHeight3 { - get - { - return m_terrainStartHeight3; - } + get { return m_terrainStartHeight3; } set { m_terrainStartHeight3 = value; configMember.forceSetConfigurationOption("terrain_start_height_3", m_terrainStartHeight3.ToString()); } } + // Second quad - also bilinearly interpolated. // Terrain texturing is done that: // 0..3 (0 = base0, 3 = base3) = (terrain[x,y] - start[x,y]) / range[x,y] private float m_terrainHeightRange0; + public float terrainHeightRange0 { - get - { - return m_terrainHeightRange0; - } + get { return m_terrainHeightRange0; } set { m_terrainHeightRange0 = value; @@ -457,12 +399,10 @@ namespace OpenSim.Framework } private float m_terrainHeightRange1; + public float terrainHeightRange1 { - get - { - return m_terrainHeightRange1; - } + get { return m_terrainHeightRange1; } set { m_terrainHeightRange1 = value; @@ -471,12 +411,10 @@ namespace OpenSim.Framework } private float m_terrainHeightRange2; + public float terrainHeightRange2 { - get - { - return m_terrainHeightRange2; - } + get { return m_terrainHeightRange2; } set { m_terrainHeightRange2 = value; @@ -485,26 +423,23 @@ namespace OpenSim.Framework } private float m_terrainHeightRange3; + public float terrainHeightRange3 { - get - { - return m_terrainHeightRange3; - } + get { return m_terrainHeightRange3; } set { m_terrainHeightRange3 = value; configMember.forceSetConfigurationOption("terrain_height_range_3", m_terrainHeightRange3.ToString()); } } + // Terrain Default (Must be in F32 Format!) private string m_terrainFile; + public string terrainFile { - get - { - return m_terrainFile; - } + get { return m_terrainFile; } set { m_terrainFile = value; @@ -513,12 +448,10 @@ namespace OpenSim.Framework } private double m_terrainMultiplier; + public double terrainMultiplier { - get - { - return m_terrainMultiplier; - } + get { return m_terrainMultiplier; } set { m_terrainMultiplier = value; @@ -527,12 +460,10 @@ namespace OpenSim.Framework } private float m_waterHeight; + public float waterHeight { - get - { - return m_waterHeight; - } + get { return m_waterHeight; } set { m_waterHeight = value; @@ -541,73 +472,112 @@ namespace OpenSim.Framework } private LLUUID m_terrainImageID; + public LLUUID terrainImageID { - get - { - return m_terrainImageID; - } + get { return m_terrainImageID; } set { m_terrainImageID = value; configMember.forceSetConfigurationOption("terrain_image_id", m_terrainImageID.ToString()); } } + private ConfigurationMember configMember; + public EstateSettings() { // Temporary hack to prevent multiple loadings. if (configMember == null) { - configMember = new ConfigurationMember(Path.Combine(Util.configDir(), "estate_settings.xml"), "ESTATE SETTINGS", this.loadConfigurationOptions, this.handleIncomingConfiguration); + configMember = + new ConfigurationMember(Path.Combine(Util.configDir(), "estate_settings.xml"), "ESTATE SETTINGS", + loadConfigurationOptions, handleIncomingConfiguration); configMember.performConfigurationRetrieve(); } } public void loadConfigurationOptions() { - configMember.addConfigurationOption("billable_factor", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "","0.0",true); - configMember.addConfigurationOption("estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "","0",true); - configMember.addConfigurationOption("parent_estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "", "0", true); - configMember.addConfigurationOption("max_agents", ConfigurationOption.ConfigurationTypes.TYPE_BYTE, "", "40", true); - - configMember.addConfigurationOption("object_bonus_factor", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "1.0", true); - configMember.addConfigurationOption("redirect_grid_x", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "", "0", true); - configMember.addConfigurationOption("redirect_grid_y", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "", "0", true); - configMember.addConfigurationOption("region_flags", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "", "0", true); - configMember.addConfigurationOption("sim_access", ConfigurationOption.ConfigurationTypes.TYPE_BYTE, "", "21", true); - configMember.addConfigurationOption("sun_hour", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "0", true); - configMember.addConfigurationOption("terrain_raise_limit", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "0", true); - configMember.addConfigurationOption("terrain_lower_limit", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "0", true); - configMember.addConfigurationOption("use_fixed_sun", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, "", "false", true); - configMember.addConfigurationOption("price_per_meter", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "", "1", true); - configMember.addConfigurationOption("region_water_height", ConfigurationOption.ConfigurationTypes.TYPE_UINT16, "", "20", true); - configMember.addConfigurationOption("region_allow_terraform", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, "", "true", true); - - configMember.addConfigurationOption("terrain_base_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", "b8d3965a-ad78-bf43-699b-bff8eca6c975", true); - configMember.addConfigurationOption("terrain_base_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", "abb783e6-3e93-26c0-248a-247666855da3", true); - configMember.addConfigurationOption("terrain_base_2", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", "179cdabd-398a-9b6b-1391-4dc333ba321f", true); - configMember.addConfigurationOption("terrain_base_3", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", "beb169c7-11ea-fff2-efe5-0f24dc881df2", true); - - configMember.addConfigurationOption("terrain_detail_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", "00000000-0000-0000-0000-000000000000", true); - configMember.addConfigurationOption("terrain_detail_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", "00000000-0000-0000-0000-000000000000", true); - configMember.addConfigurationOption("terrain_detail_2", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", "00000000-0000-0000-0000-000000000000", true); - configMember.addConfigurationOption("terrain_detail_3", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", "00000000-0000-0000-0000-000000000000", true); - - configMember.addConfigurationOption("terrain_start_height_0", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "10.0", true); - configMember.addConfigurationOption("terrain_start_height_1", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "10.0", true); - configMember.addConfigurationOption("terrain_start_height_2", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "10.0", true); - configMember.addConfigurationOption("terrain_start_height_3", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "10.0", true); - - configMember.addConfigurationOption("terrain_height_range_0", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true); - configMember.addConfigurationOption("terrain_height_range_1", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true); - configMember.addConfigurationOption("terrain_height_range_2", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true); - configMember.addConfigurationOption("terrain_height_range_3", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true); - - configMember.addConfigurationOption("terrain_file", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "", "default.r32", true); - configMember.addConfigurationOption("terrain_multiplier", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true); - configMember.addConfigurationOption("water_height", ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE, "", "20.0", true); - configMember.addConfigurationOption("terrain_image_id", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", "00000000-0000-0000-0000-000000000000", true); + configMember.addConfigurationOption("billable_factor", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", + "0.0", true); + configMember.addConfigurationOption("estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "", "0", + true); + configMember.addConfigurationOption("parent_estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, + "", "0", true); + configMember.addConfigurationOption("max_agents", ConfigurationOption.ConfigurationTypes.TYPE_BYTE, "", "40", + true); + + configMember.addConfigurationOption("object_bonus_factor", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, + "", "1.0", true); + configMember.addConfigurationOption("redirect_grid_x", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "", + "0", true); + configMember.addConfigurationOption("redirect_grid_y", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "", + "0", true); + configMember.addConfigurationOption("region_flags", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "", + "0", true); + configMember.addConfigurationOption("sim_access", ConfigurationOption.ConfigurationTypes.TYPE_BYTE, "", "21", + true); + configMember.addConfigurationOption("sun_hour", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "0", + true); + configMember.addConfigurationOption("terrain_raise_limit", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, + "", "0", true); + configMember.addConfigurationOption("terrain_lower_limit", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, + "", "0", true); + configMember.addConfigurationOption("use_fixed_sun", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, "", + "false", true); + configMember.addConfigurationOption("price_per_meter", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, + "", "1", true); + configMember.addConfigurationOption("region_water_height", + ConfigurationOption.ConfigurationTypes.TYPE_UINT16, "", "20", true); + configMember.addConfigurationOption("region_allow_terraform", + ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, "", "true", true); + + configMember.addConfigurationOption("terrain_base_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", + "b8d3965a-ad78-bf43-699b-bff8eca6c975", true); + configMember.addConfigurationOption("terrain_base_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", + "abb783e6-3e93-26c0-248a-247666855da3", true); + configMember.addConfigurationOption("terrain_base_2", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", + "179cdabd-398a-9b6b-1391-4dc333ba321f", true); + configMember.addConfigurationOption("terrain_base_3", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", + "beb169c7-11ea-fff2-efe5-0f24dc881df2", true); + + configMember.addConfigurationOption("terrain_detail_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, + "", "00000000-0000-0000-0000-000000000000", true); + configMember.addConfigurationOption("terrain_detail_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, + "", "00000000-0000-0000-0000-000000000000", true); + configMember.addConfigurationOption("terrain_detail_2", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, + "", "00000000-0000-0000-0000-000000000000", true); + configMember.addConfigurationOption("terrain_detail_3", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, + "", "00000000-0000-0000-0000-000000000000", true); + + configMember.addConfigurationOption("terrain_start_height_0", + ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "10.0", true); + configMember.addConfigurationOption("terrain_start_height_1", + ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "10.0", true); + configMember.addConfigurationOption("terrain_start_height_2", + ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "10.0", true); + configMember.addConfigurationOption("terrain_start_height_3", + ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "10.0", true); + + configMember.addConfigurationOption("terrain_height_range_0", + ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true); + configMember.addConfigurationOption("terrain_height_range_1", + ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true); + configMember.addConfigurationOption("terrain_height_range_2", + ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true); + configMember.addConfigurationOption("terrain_height_range_3", + ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true); + + configMember.addConfigurationOption("terrain_file", + ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "", + "default.r32", true); + configMember.addConfigurationOption("terrain_multiplier", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, + "", "60.0", true); + configMember.addConfigurationOption("water_height", ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE, "", + "20.0", true); + configMember.addConfigurationOption("terrain_image_id", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, + "", "00000000-0000-0000-0000-000000000000", true); } public bool handleIncomingConfiguration(string configuration_key, object configuration_result) @@ -615,123 +585,123 @@ namespace OpenSim.Framework switch (configuration_key) { case "billable_factor": - this.m_billableFactor = (float)configuration_result; + m_billableFactor = (float) configuration_result; break; case "estate_id": - this.m_estateID = (uint)configuration_result; + m_estateID = (uint) configuration_result; break; case "parent_estate_id": - this.m_parentEstateID = (uint)configuration_result; + m_parentEstateID = (uint) configuration_result; break; case "max_agents": - this.m_maxAgents = (byte)configuration_result; + m_maxAgents = (byte) configuration_result; break; case "object_bonus_factor": - this.m_objectBonusFactor = (float)configuration_result; + m_objectBonusFactor = (float) configuration_result; break; case "redirect_grid_x": - this.m_redirectGridX = (int)configuration_result; + m_redirectGridX = (int) configuration_result; break; case "redirect_grid_y": - this.m_redirectGridY = (int)configuration_result; + m_redirectGridY = (int) configuration_result; break; case "region_flags": - this.m_regionFlags = (Simulator.RegionFlags)((uint)configuration_result); + m_regionFlags = (Simulator.RegionFlags) ((uint) configuration_result); break; case "sim_access": - this.m_simAccess = (Simulator.SimAccess)((byte)configuration_result); + m_simAccess = (Simulator.SimAccess) ((byte) configuration_result); break; case "sun_hour": - this.m_sunHour = (float)configuration_result; + m_sunHour = (float) configuration_result; break; case "terrain_raise_limit": - this.m_terrainRaiseLimit = (float)configuration_result; + m_terrainRaiseLimit = (float) configuration_result; break; case "terrain_lower_limit": - this.m_terrainLowerLimit = (float)configuration_result; + m_terrainLowerLimit = (float) configuration_result; break; case "use_fixed_sun": - this.m_useFixedSun = (bool)configuration_result; + m_useFixedSun = (bool) configuration_result; break; case "price_per_meter": - this.m_pricePerMeter = System.Convert.ToInt32(configuration_result); + m_pricePerMeter = Convert.ToInt32(configuration_result); break; case "region_water_height": - this.m_regionWaterHeight = (ushort)configuration_result; + m_regionWaterHeight = (ushort) configuration_result; break; case "region_allow_terraform": - this.m_regionAllowTerraform = (bool)configuration_result; + m_regionAllowTerraform = (bool) configuration_result; break; case "terrain_base_0": - this.m_terrainBase0 = (LLUUID)configuration_result; + m_terrainBase0 = (LLUUID) configuration_result; break; case "terrain_base_1": - this.m_terrainBase1 = (LLUUID)configuration_result; + m_terrainBase1 = (LLUUID) configuration_result; break; case "terrain_base_2": - this.m_terrainBase2 = (LLUUID)configuration_result; + m_terrainBase2 = (LLUUID) configuration_result; break; case "terrain_base_3": - this.m_terrainBase3 = (LLUUID)configuration_result; + m_terrainBase3 = (LLUUID) configuration_result; break; case "terrain_detail_0": - this.m_terrainDetail0 = (LLUUID)configuration_result; + m_terrainDetail0 = (LLUUID) configuration_result; break; case "terrain_detail_1": - this.m_terrainDetail1 = (LLUUID)configuration_result; + m_terrainDetail1 = (LLUUID) configuration_result; break; case "terrain_detail_2": - this.m_terrainDetail2 = (LLUUID)configuration_result; + m_terrainDetail2 = (LLUUID) configuration_result; break; case "terrain_detail_3": - this.m_terrainDetail3 = (LLUUID)configuration_result; + m_terrainDetail3 = (LLUUID) configuration_result; break; case "terrain_start_height_0": - this.m_terrainStartHeight0 = (float)configuration_result; + m_terrainStartHeight0 = (float) configuration_result; break; case "terrain_start_height_1": - this.m_terrainStartHeight1 = (float)configuration_result; + m_terrainStartHeight1 = (float) configuration_result; break; case "terrain_start_height_2": - this.m_terrainStartHeight2 = (float)configuration_result; + m_terrainStartHeight2 = (float) configuration_result; break; case "terrain_start_height_3": - this.m_terrainStartHeight3 = (float)configuration_result; + m_terrainStartHeight3 = (float) configuration_result; break; case "terrain_height_range_0": - this.m_terrainHeightRange0 = (float)configuration_result; + m_terrainHeightRange0 = (float) configuration_result; break; case "terrain_height_range_1": - this.m_terrainHeightRange1 = (float)configuration_result; + m_terrainHeightRange1 = (float) configuration_result; break; case "terrain_height_range_2": - this.m_terrainHeightRange2 = (float)configuration_result; + m_terrainHeightRange2 = (float) configuration_result; break; case "terrain_height_range_3": - this.m_terrainHeightRange3 = (float)configuration_result; + m_terrainHeightRange3 = (float) configuration_result; break; case "terrain_file": - this.m_terrainFile = (string)configuration_result; + m_terrainFile = (string) configuration_result; break; case "terrain_multiplier": - this.m_terrainMultiplier = System.Convert.ToDouble(configuration_result); + m_terrainMultiplier = Convert.ToDouble(configuration_result); break; case "water_height": double tmpVal = (double) configuration_result; - this.m_waterHeight = (float) tmpVal; + m_waterHeight = (float) tmpVal; break; case "terrain_image_id": - this.m_terrainImageID = (LLUUID)configuration_result; + m_terrainImageID = (LLUUID) configuration_result; break; } return true; } } -} +} \ No newline at end of file -- cgit v1.1