1 files changed, 737 insertions, 738 deletions
diff --git a/OpenSim/Framework/General/Types/EstateSettings.cs b/OpenSim/Framework/General/EstateSettings.cs
index 2675e52..3e99424 100644
--- a/OpenSim/Framework/General/Types/EstateSettings.cs
+++ b/OpenSim/Framework/General/EstateSettings.cs
@@ -1,738 +1,737 @@
-/*
+/*
-* Copyright (c) Contributors, http://opensimulator.org/
+* Copyright (c) Contributors, http://opensimulator.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
+*
-* Redistribution and use in source and binary forms, with or without
+* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
+* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
+*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
+*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
+*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
+*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
+*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
+*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
+*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
+*       derived from this software without specific prior written permission.
-*
+*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
+* 
-*/
+*/
-using System.IO;
+using System.IO;
-using libsecondlife;
+using libsecondlife;
-using OpenSim.Framework.Configuration;
+using OpenSim.Framework;
-using OpenSim.Framework.Utilities;
+using System.Globalization;
-using System.Globalization;
+namespace OpenSim.Framework
-namespace OpenSim.Framework.Types
+{
-{
+    public class EstateSettings
-    public class EstateSettings
+    {
-    {
+        
-        
+        //Settings to this island
-        //Settings to this island
+        private float m_billableFactor;
-        private float m_billableFactor;
+        public float billableFactor
-        public float billableFactor
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_billableFactor;
-                return m_billableFactor;
+            }
-            }
+            set
-            set
+            {
-            {
+                m_billableFactor = value;
-                m_billableFactor = value;
+                configMember.forceSetConfigurationOption("billable_factor", m_billableFactor.ToString());
-                configMember.forceSetConfigurationOption("billable_factor", m_billableFactor.ToString());
+            }
-            }
+        }
-        }
+        private uint m_estateID;
-        private uint m_estateID;
+        public uint estateID
-        public uint estateID
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_estateID;
-                return m_estateID;
+            }
-            }
+            set
-            set
+            {
-            {
+                m_estateID = value;
-                m_estateID = value;
+                configMember.forceSetConfigurationOption("estate_id", m_estateID.ToString());
-                configMember.forceSetConfigurationOption("estate_id", m_estateID.ToString());
+            }
-            }
+        }
-        }
+        private uint m_parentEstateID;
-        private uint m_parentEstateID;
+        public uint parentEstateID
-        public uint parentEstateID
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_parentEstateID;
-                return m_parentEstateID;
+            }
-            }
+            set
-            set
+            {
-            {
+                m_parentEstateID = value;
-                m_parentEstateID = value;
+                configMember.forceSetConfigurationOption("parent_estate_id", m_parentEstateID.ToString());
-                configMember.forceSetConfigurationOption("parent_estate_id", m_parentEstateID.ToString());
+            }
-            }
+        }
-        }
+        private byte m_maxAgents;
-        private byte m_maxAgents;
+        public byte maxAgents
-        public byte maxAgents
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_maxAgents;
-                return m_maxAgents;
+            }
-            }
+            set
-            set
+            {
-            {
+                m_maxAgents = value;
-                m_maxAgents = value;
+                configMember.forceSetConfigurationOption("max_agents", m_maxAgents.ToString());
-                configMember.forceSetConfigurationOption("max_agents", m_maxAgents.ToString());
+            }
-            }
+        }
-        }
+        private float m_objectBonusFactor;
-        private float m_objectBonusFactor;
+        public float objectBonusFactor
-        public float objectBonusFactor
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_objectBonusFactor;
-                return m_objectBonusFactor;
+            }
-            }
+            set
-            set
+            {
-            {
+                m_objectBonusFactor = value;
-                m_objectBonusFactor = value;
+                configMember.forceSetConfigurationOption("object_bonus_factor", m_objectBonusFactor.ToString());
-                configMember.forceSetConfigurationOption("object_bonus_factor", m_objectBonusFactor.ToString());
+            }
-            }
+        }
-        }
+        private int m_redirectGridX;
-        private int m_redirectGridX;
+        public int redirectGridX
-        public int redirectGridX
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_redirectGridX;
-                return m_redirectGridX;
+            }
-            }
+            set
-            set
+            {
-            {
+                m_redirectGridX = value;
-                m_redirectGridX = value;
+                configMember.forceSetConfigurationOption("redirect_grid_x", m_redirectGridX.ToString());
-                configMember.forceSetConfigurationOption("redirect_grid_x", m_redirectGridX.ToString());
+            }
-            }
+        }
-        }
+        private int m_redirectGridY;
-        private int m_redirectGridY;
+        public int redirectGridY
-        public int redirectGridY
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_redirectGridY;
-                return m_redirectGridY;
+            }
-            }
+            set
-            set
+            {
-            {
+                m_redirectGridY = value;
-                m_redirectGridY = value;
+                configMember.forceSetConfigurationOption("redirect_grid_y", m_redirectGridY.ToString());
-                configMember.forceSetConfigurationOption("redirect_grid_y", m_redirectGridY.ToString());
+            }
-            }
+        }
-        }
+        private Simulator.RegionFlags m_regionFlags;
-        private Simulator.RegionFlags m_regionFlags;
+        public Simulator.RegionFlags regionFlags
-        public Simulator.RegionFlags regionFlags
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_regionFlags;
-                return m_regionFlags;
+            }
-            }
+            set
-            set
+            {
-            {
+                m_regionFlags = value;
-                m_regionFlags = value;
+                configMember.forceSetConfigurationOption("region_flags", m_regionFlags.ToString());
-                configMember.forceSetConfigurationOption("region_flags", m_regionFlags.ToString());
+            }
-            }
+        }
-        }
+        private Simulator.SimAccess m_simAccess;
-        private Simulator.SimAccess m_simAccess;
+        public Simulator.SimAccess simAccess
-        public Simulator.SimAccess simAccess
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_simAccess;
-                return m_simAccess;
+            }
-            }
+            set
-            set
+            {
-            {
+                m_simAccess = value;
-                m_simAccess = value;
+                configMember.forceSetConfigurationOption("sim_access", m_simAccess.ToString());
-                configMember.forceSetConfigurationOption("sim_access", m_simAccess.ToString());
+            }
-            }
+        }
-        }
+        private float m_sunHour;
-        private float m_sunHour;
+        public float sunHour
-        public float sunHour
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_sunHour;
-                return m_sunHour;
+            }
-            }
+            set
-            set
+            {
-            {
+                m_sunHour = value;
-                m_sunHour = value;
+                configMember.forceSetConfigurationOption("sun_hour", m_sunHour.ToString());
-                configMember.forceSetConfigurationOption("sun_hour", m_sunHour.ToString());
+            }
-            }
+        }
-        }
+        private float m_terrainRaiseLimit;
-        private float m_terrainRaiseLimit;
+        public float terrainRaiseLimit
-        public float terrainRaiseLimit
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_terrainRaiseLimit;
-                return m_terrainRaiseLimit;
+            }
-            }
+            set
-            set
+            {
-            {
+                m_terrainRaiseLimit = value;
-                m_terrainRaiseLimit = value;
+                configMember.forceSetConfigurationOption("terrain_raise_limit", m_terrainRaiseLimit.ToString());
-                configMember.forceSetConfigurationOption("terrain_raise_limit", m_terrainRaiseLimit.ToString());
+            }
-            }
+        }
-        }
+        private float m_terrainLowerLimit;
-        private float m_terrainLowerLimit;
+        public float terrainLowerLimit
-        public float terrainLowerLimit
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_terrainLowerLimit;
-                return m_terrainLowerLimit;
+            }
-            }
+            set
-            set
+            {
-            {
+                m_terrainLowerLimit = value;
-                m_terrainLowerLimit = value;
+                configMember.forceSetConfigurationOption("terrain_lower_limit", m_terrainLowerLimit.ToString());
-                configMember.forceSetConfigurationOption("terrain_lower_limit", m_terrainLowerLimit.ToString());
+            }
-            }
+        }
-        }
+        private bool m_useFixedSun;
-        private bool m_useFixedSun;
+        public bool useFixedSun
-        public bool useFixedSun
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_useFixedSun;
-                return m_useFixedSun;
+            }
-            }
+            set
-            set
+            {
-            {
+                m_useFixedSun = value;
-                m_useFixedSun = value;
+                configMember.forceSetConfigurationOption("use_fixed_sun", m_useFixedSun.ToString());
-                configMember.forceSetConfigurationOption("use_fixed_sun", m_useFixedSun.ToString());
+            }
-            }
+        }
-        }
+        private int m_pricePerMeter;
-        private int m_pricePerMeter;
+        public int pricePerMeter
-        public int pricePerMeter
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_pricePerMeter;
-                return m_pricePerMeter;
+            }
-            }
+            set
-            set
+            {
-            {
+                m_pricePerMeter = value;
-                m_pricePerMeter = value;
+                configMember.forceSetConfigurationOption("price_per_meter", m_pricePerMeter.ToString());
-                configMember.forceSetConfigurationOption("price_per_meter", m_pricePerMeter.ToString());
+            }
-            }
+        }
-        }
+        private ushort m_regionWaterHeight;
-        private ushort m_regionWaterHeight;
+        public ushort regionWaterHeight
-        public ushort regionWaterHeight
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_regionWaterHeight;
-                return m_regionWaterHeight;
+            }
-            }
+            set
-            set
+            {
-            {
+                m_regionWaterHeight = value;
-                m_regionWaterHeight = value;
+                configMember.forceSetConfigurationOption("region_water_height", m_regionWaterHeight.ToString());
-                configMember.forceSetConfigurationOption("region_water_height", m_regionWaterHeight.ToString());
+            }
-            }
+        }
-        }
+        private bool m_regionAllowTerraform;
-        private bool m_regionAllowTerraform;
+        public bool regionAllowTerraform
-        public bool regionAllowTerraform
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_regionAllowTerraform;
-                return m_regionAllowTerraform;
+            }
-            }
+            set
-            set
+            {
-            {
+                m_regionAllowTerraform = value;
-                m_regionAllowTerraform = value;
+                configMember.forceSetConfigurationOption("region_allow_terraform", m_regionAllowTerraform.ToString());
-                configMember.forceSetConfigurationOption("region_allow_terraform", m_regionAllowTerraform.ToString());
+            }
-            }
+        }
-        }
+        
-        
+        // Region Information
-        // Region Information
+        // Low resolution 'base' textures. No longer used.
-        // Low resolution 'base' textures. No longer used.
+        private LLUUID m_terrainBase0;
-        private LLUUID m_terrainBase0;
+        public LLUUID terrainBase0
-        public LLUUID terrainBase0
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_terrainBase0;
-                return m_terrainBase0;
+            }
-            }
+            set
-            set
+            {
-            {
+                m_terrainBase0 = value;
-                m_terrainBase0 = value;
+                configMember.forceSetConfigurationOption("terrain_base_0", m_terrainBase0.ToString());
-                configMember.forceSetConfigurationOption("terrain_base_0", m_terrainBase0.ToString());
+            }
-            }
+        }
-        }
+        private LLUUID m_terrainBase1;
-        private LLUUID m_terrainBase1;
+        public LLUUID terrainBase1
-        public LLUUID terrainBase1
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_terrainBase1;
-                return m_terrainBase1;
+            }
-            }
+            set
-            set
+            {
-            {
+                m_terrainBase1 = value;
-                m_terrainBase1 = value;
+                configMember.forceSetConfigurationOption("terrain_base_1", m_terrainBase1.ToString());
-                configMember.forceSetConfigurationOption("terrain_base_1", m_terrainBase1.ToString());
+            }
-            }
+        }
-        }
+        private LLUUID m_terrainBase2;
-        private LLUUID m_terrainBase2;
+        public LLUUID terrainBase2
-        public LLUUID terrainBase2
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_terrainBase2;
-                return m_terrainBase2;
+            }
-            }
+            set
-            set
+            {
-            {
+                m_terrainBase2 = value;
-                m_terrainBase2 = value;
+                configMember.forceSetConfigurationOption("terrain_base_2", m_terrainBase2.ToString());
-                configMember.forceSetConfigurationOption("terrain_base_2", m_terrainBase2.ToString());
+            }
-            }
+        }
-        }
+        private LLUUID m_terrainBase3;
-        private LLUUID m_terrainBase3;
+        public LLUUID terrainBase3
-        public LLUUID terrainBase3
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_terrainBase3;
-                return m_terrainBase3;
+            }
-            }
+            set
-            set
+            {
-            {
+                m_terrainBase3 = value;
-                m_terrainBase3 = value;
+                configMember.forceSetConfigurationOption("terrain_base_3", m_terrainBase3.ToString());
-                configMember.forceSetConfigurationOption("terrain_base_3", m_terrainBase3.ToString());
+            }
-            }
+        }
-        }
+        // Higher resolution terrain textures
-        // Higher resolution terrain textures
+        private LLUUID m_terrainDetail0;
-        private LLUUID m_terrainDetail0;
+        public LLUUID terrainDetail0
-        public LLUUID terrainDetail0
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_terrainDetail0;
-                return m_terrainDetail0;
+            }
-            }
+            set
-            set
+            {
-            {
+                
-                
+                m_terrainDetail0 = value;
-                m_terrainDetail0 = value;
+                configMember.forceSetConfigurationOption("terrain_detail_0", m_terrainDetail0.ToString());
-                configMember.forceSetConfigurationOption("terrain_detail_0", m_terrainDetail0.ToString());
+            }
-            }
+        }
-        }
+        private LLUUID m_terrainDetail1;
-        private LLUUID m_terrainDetail1;
+        public LLUUID terrainDetail1
-        public LLUUID terrainDetail1
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_terrainDetail1;
-                return m_terrainDetail1;
+            }
-            }
+            set
-            set
+            {
-            {
+                m_terrainDetail1 = value;
-                m_terrainDetail1 = value;
+                configMember.forceSetConfigurationOption("terrain_detail_1", m_terrainDetail1.ToString());
-                configMember.forceSetConfigurationOption("terrain_detail_1", m_terrainDetail1.ToString());
+            }
-            }
+        }
-        }
+        private LLUUID m_terrainDetail2;
-        private LLUUID m_terrainDetail2;
+        public LLUUID terrainDetail2
-        public LLUUID terrainDetail2
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_terrainDetail2;
-                return m_terrainDetail2;
+            }
-            }
+            set
-            set
+            {
-            {
+                m_terrainDetail2 = value;
-                m_terrainDetail2 = value;
+                configMember.forceSetConfigurationOption("terrain_detail_2", m_terrainDetail2.ToString());
-                configMember.forceSetConfigurationOption("terrain_detail_2", m_terrainDetail2.ToString());
+            }
-            }
+        }
-        }
+        private LLUUID m_terrainDetail3;
-        private LLUUID m_terrainDetail3;
+        public LLUUID terrainDetail3
-        public LLUUID terrainDetail3
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_terrainDetail3;
-                return m_terrainDetail3;
+            }
-            }
+            set
-            set
+            {
-            {
+                m_terrainDetail3 = value;
-                m_terrainDetail3 = value;
+                configMember.forceSetConfigurationOption("terrain_detail_3", m_terrainDetail3.ToString());
-                configMember.forceSetConfigurationOption("terrain_detail_3", m_terrainDetail3.ToString());
+            }
-            }
+        }
-        }
+        // First quad - each point is bilinearly interpolated at each meter of terrain
-        // First quad - each point is bilinearly interpolated at each meter of terrain
+        private float m_terrainStartHeight0;
-        private float m_terrainStartHeight0;
+        public float terrainStartHeight0
-        public float terrainStartHeight0
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_terrainStartHeight0;
-                return m_terrainStartHeight0;
+            }
-            }
+            set
-            set
+            {
-            {
+                m_terrainStartHeight0 = value;
-                m_terrainStartHeight0 = value;
+                configMember.forceSetConfigurationOption("terrain_start_height_0", m_terrainStartHeight0.ToString());
-                configMember.forceSetConfigurationOption("terrain_start_height_0", m_terrainStartHeight0.ToString());
+            }
-            }
+        }
-        }
+        private float m_terrainStartHeight1;
-        private float m_terrainStartHeight1;
+        public float terrainStartHeight1
-        public float terrainStartHeight1
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_terrainStartHeight1;
-                return m_terrainStartHeight1;
+            }
-            }
+            set
-            set
+            {
-            {
+                m_terrainStartHeight1 = value;
-                m_terrainStartHeight1 = value;
+                configMember.forceSetConfigurationOption("terrain_start_height_1", m_terrainStartHeight1.ToString());
-                configMember.forceSetConfigurationOption("terrain_start_height_1", m_terrainStartHeight1.ToString());
+            }
-            }
+        }
-        }
+        private float m_terrainStartHeight2;
-        private float m_terrainStartHeight2;
+        public float terrainStartHeight2
-        public float terrainStartHeight2
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_terrainStartHeight2;
-                return m_terrainStartHeight2;
+            }
-            }
+            set
-            set
+            {
-            {
+                m_terrainStartHeight2 = value;
-                m_terrainStartHeight2 = value;
+                configMember.forceSetConfigurationOption("terrain_start_height_2", m_terrainStartHeight2.ToString());
-                configMember.forceSetConfigurationOption("terrain_start_height_2", m_terrainStartHeight2.ToString());
+            }
-            }
+        }
-        }
+        private float m_terrainStartHeight3;
-        private float m_terrainStartHeight3;
+        public float terrainStartHeight3
-        public float terrainStartHeight3
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_terrainStartHeight3;
-                return m_terrainStartHeight3;
+            }
-            }
+            set
-            set
+            {
-            {
+                m_terrainStartHeight3 = value;
-                m_terrainStartHeight3 = value;
+                configMember.forceSetConfigurationOption("terrain_start_height_3", m_terrainStartHeight3.ToString());
-                configMember.forceSetConfigurationOption("terrain_start_height_3", m_terrainStartHeight3.ToString());
+            }
-            }
+        }
-        }
+        // Second quad - also bilinearly interpolated.
-        // Second quad - also bilinearly interpolated.
+        // Terrain texturing is done that:
-        // Terrain texturing is done that:
+        // 0..3 (0 = base0, 3 = base3) = (terrain[x,y] - start[x,y]) / range[x,y]
-        // 0..3 (0 = base0, 3 = base3) = (terrain[x,y] - start[x,y]) / range[x,y]
+        private float m_terrainHeightRange0;
-        private float m_terrainHeightRange0;
+        public float terrainHeightRange0
-        public float terrainHeightRange0
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_terrainHeightRange0;
-                return m_terrainHeightRange0;
+            }
-            }
+            set
-            set
+            {
-            {
+                m_terrainHeightRange0 = value;
-                m_terrainHeightRange0 = value;
+                configMember.forceSetConfigurationOption("terrain_height_range_0", m_terrainHeightRange0.ToString());
-                configMember.forceSetConfigurationOption("terrain_height_range_0", m_terrainHeightRange0.ToString());
+            }
-            }
+        }
-        }
+        private float m_terrainHeightRange1;
-        private float m_terrainHeightRange1;
+        public float terrainHeightRange1
-        public float terrainHeightRange1
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_terrainHeightRange1;
-                return m_terrainHeightRange1;
+            }
-            }
+            set
-            set
+            {
-            {
+                m_terrainHeightRange1 = value;
-                m_terrainHeightRange1 = value;
+                configMember.forceSetConfigurationOption("terrain_height_range_1", m_terrainHeightRange1.ToString());
-                configMember.forceSetConfigurationOption("terrain_height_range_1", m_terrainHeightRange1.ToString());
+            }
-            }
+        }
-        }
+        private float m_terrainHeightRange2;
-        private float m_terrainHeightRange2;
+        public float terrainHeightRange2
-        public float terrainHeightRange2
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_terrainHeightRange2;
-                return m_terrainHeightRange2;
+            }
-            }
+            set
-            set
+            {
-            {
+                m_terrainHeightRange2 = value;
-                m_terrainHeightRange2 = value;
+                configMember.forceSetConfigurationOption("terrain_height_range_2", m_terrainHeightRange2.ToString());
-                configMember.forceSetConfigurationOption("terrain_height_range_2", m_terrainHeightRange2.ToString());
+            }
-            }
+        }
-        }
+        private float m_terrainHeightRange3;
-        private float m_terrainHeightRange3;
+        public float terrainHeightRange3
-        public float terrainHeightRange3
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_terrainHeightRange3;
-                return m_terrainHeightRange3;
+            }
-            }
+            set
-            set
+            {
-            {
+                m_terrainHeightRange3 = value;
-                m_terrainHeightRange3 = value;
+                configMember.forceSetConfigurationOption("terrain_height_range_3", m_terrainHeightRange3.ToString());
-                configMember.forceSetConfigurationOption("terrain_height_range_3", m_terrainHeightRange3.ToString());
+            }
-            }
+        }
-        }
+        // Terrain Default (Must be in F32 Format!)
-        // Terrain Default (Must be in F32 Format!)
+        private string m_terrainFile;
-        private string m_terrainFile;
+        public string terrainFile
-        public string terrainFile
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_terrainFile;
-                return m_terrainFile;
+            }
-            }
+            set
-            set
+            {
-            {
+                m_terrainFile = value;
-                m_terrainFile = value;
+                configMember.forceSetConfigurationOption("terrain_file", m_terrainFile.ToString());
-                configMember.forceSetConfigurationOption("terrain_file", m_terrainFile.ToString());
+            }
-            }
+        }
-        }
+        private double m_terrainMultiplier;
-        private double m_terrainMultiplier;
+        public double terrainMultiplier
-        public double terrainMultiplier
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_terrainMultiplier;
-                return m_terrainMultiplier;
+            }
-            }
+            set
-            set
+            {
-            {
+                m_terrainMultiplier = value;
-                m_terrainMultiplier = value;
+                configMember.forceSetConfigurationOption("terrain_multiplier", m_terrainMultiplier.ToString());
-                configMember.forceSetConfigurationOption("terrain_multiplier", m_terrainMultiplier.ToString());
+            }
-            }
+        }
-        }
+        private float m_waterHeight;
-        private float m_waterHeight;
+        public float waterHeight
-        public float waterHeight
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_waterHeight;
-                return m_waterHeight;
+            }
-            }
+            set
-            set
+            {
-            {
+                m_waterHeight = value;
-                m_waterHeight = value;
+                configMember.forceSetConfigurationOption("water_height", m_waterHeight.ToString());
-                configMember.forceSetConfigurationOption("water_height", m_waterHeight.ToString());
+            }
-            }
+        }
-        }
+        private LLUUID m_terrainImageID;
-        private LLUUID m_terrainImageID;
+        public LLUUID terrainImageID
-        public LLUUID terrainImageID
+        {
-        {
+            get
-            get
+            {
-            {
+                return m_terrainImageID;
-                return m_terrainImageID;
+            }
-            }
+            set
-            set
+            {
-            {
+                m_terrainImageID = value;
-                m_terrainImageID = value;
+                configMember.forceSetConfigurationOption("terrain_image_id", m_terrainImageID.ToString());
-                configMember.forceSetConfigurationOption("terrain_image_id", m_terrainImageID.ToString());
+            }
-            }
+        }
-        }
+        private ConfigurationMember configMember;
-        private ConfigurationMember configMember;
+        public EstateSettings()
-        public EstateSettings()
+        {
-        {
+            // Temporary hack to prevent multiple loadings.
-            // Temporary hack to prevent multiple loadings.
+            if (configMember == null)
-            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", this.loadConfigurationOptions, this.handleIncomingConfiguration);
+                configMember.performConfigurationRetrieve();
-                configMember.performConfigurationRetrieve();
+            }
-            }
+        }
-        }
+        public void loadConfigurationOptions()
-        public void loadConfigurationOptions()
+        {
-        {
+            configMember.addConfigurationOption("billable_factor", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "","0.0",true);
-            configMember.addConfigurationOption("billable_factor", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "","0.0",true);
+            configMember.addConfigurationOption("estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "","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("parent_estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "", "0", true);
+            configMember.addConfigurationOption("max_agents", ConfigurationOption.ConfigurationTypes.TYPE_BYTE, "", "40", 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("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_x", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "", "0", true);
+            configMember.addConfigurationOption("redirect_grid_y", 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("region_flags", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "", "0", true);
+            configMember.addConfigurationOption("sim_access", ConfigurationOption.ConfigurationTypes.TYPE_BYTE, "", "21", true);
-            configMember.addConfigurationOption("sim_access", ConfigurationOption.ConfigurationTypes.TYPE_BYTE, "", "21", true);
+            configMember.addConfigurationOption("sun_hour", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "0", 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_raise_limit", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "0", true);
+            configMember.addConfigurationOption("terrain_lower_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("use_fixed_sun", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, "", "false", true);
+            configMember.addConfigurationOption("price_per_meter", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "", "1", 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_water_height", ConfigurationOption.ConfigurationTypes.TYPE_UINT16, "", "20", true);
+            configMember.addConfigurationOption("region_allow_terraform", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, "", "true", 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_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_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_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_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_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_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_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_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_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_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_2", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "10.0", true);
+            configMember.addConfigurationOption("terrain_start_height_3", 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_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_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_2", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true);
+            configMember.addConfigurationOption("terrain_height_range_3", 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_file", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "", "default.r32", true);
+            configMember.addConfigurationOption("terrain_multiplier", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", 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("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("terrain_image_id", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", "00000000-0000-0000-0000-000000000000", true);
+        }
-        }
+        public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
-        public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
+        {
-        {
+            switch (configuration_key)
-            switch (configuration_key)
+            {
-            {
+                case "billable_factor":
-                case "billable_factor":
+                    this.m_billableFactor = (float)configuration_result;
-                    this.m_billableFactor = (float)configuration_result;
+                    break;
-                    break;
+                case "estate_id":
-                case "estate_id":
+                    this.m_estateID = (uint)configuration_result;
-                    this.m_estateID = (uint)configuration_result;
+                    break;
-                    break;
+                case "parent_estate_id":
-                case "parent_estate_id":
+                    this.m_parentEstateID = (uint)configuration_result;
-                    this.m_parentEstateID = (uint)configuration_result;
+                    break;
-                    break;
+                case "max_agents":
-                case "max_agents":
+                    this.m_maxAgents = (byte)configuration_result;
-                    this.m_maxAgents = (byte)configuration_result;
+                    break;
-                    break;
+                case "object_bonus_factor":
-                case "object_bonus_factor":
+                    this.m_objectBonusFactor = (float)configuration_result;
-                    this.m_objectBonusFactor = (float)configuration_result;
+                    break;
-                    break;
+                case "redirect_grid_x":
-                case "redirect_grid_x":
+                    this.m_redirectGridX = (int)configuration_result;
-                    this.m_redirectGridX = (int)configuration_result;
+                    break;
-                    break;
+                case "redirect_grid_y":
-                case "redirect_grid_y":
+                    this.m_redirectGridY = (int)configuration_result;
-                    this.m_redirectGridY = (int)configuration_result;
+                    break;
-                    break;
+                case "region_flags":
-                case "region_flags":
+                    this.m_regionFlags = (Simulator.RegionFlags)((uint)configuration_result);
-                    this.m_regionFlags = (Simulator.RegionFlags)((uint)configuration_result);
+                    break;
-                    break;
+                case "sim_access":
-                case "sim_access":
+                    this.m_simAccess = (Simulator.SimAccess)((byte)configuration_result);
-                    this.m_simAccess = (Simulator.SimAccess)((byte)configuration_result);
+                    break;
-                    break;
+                case "sun_hour":
-                case "sun_hour":
+                    this.m_sunHour = (float)configuration_result;
-                    this.m_sunHour = (float)configuration_result;
+                    break;
-                    break;
+                case "terrain_raise_limit":
-                case "terrain_raise_limit":
+                    this.m_terrainRaiseLimit = (float)configuration_result;
-                    this.m_terrainRaiseLimit = (float)configuration_result;
+                    break;
-                    break;
+                case "terrain_lower_limit":
-                case "terrain_lower_limit":
+                    this.m_terrainLowerLimit = (float)configuration_result;
-                    this.m_terrainLowerLimit = (float)configuration_result;
+                    break;
-                    break;
+                case "use_fixed_sun":
-                case "use_fixed_sun":
+                    this.m_useFixedSun = (bool)configuration_result;
-                    this.m_useFixedSun = (bool)configuration_result;
+                    break;
-                    break;
+                case "price_per_meter":
-                case "price_per_meter":
+                    this.m_pricePerMeter = System.Convert.ToInt32(configuration_result);
-                    this.m_pricePerMeter = System.Convert.ToInt32(configuration_result);
+                    break;
-                    break;
+                case "region_water_height":
-                case "region_water_height":
+                    this.m_regionWaterHeight = (ushort)configuration_result;
-                    this.m_regionWaterHeight = (ushort)configuration_result;
+                    break;
-                    break;
+                case "region_allow_terraform":
-                case "region_allow_terraform":
+                    this.m_regionAllowTerraform = (bool)configuration_result;
-                    this.m_regionAllowTerraform = (bool)configuration_result;
+                    break;
-                    break;
+                case "terrain_base_0":
-                case "terrain_base_0":
+                    this.m_terrainBase0 = (LLUUID)configuration_result;
-                    this.m_terrainBase0 = (LLUUID)configuration_result;
+                    break;
-                    break;
+                case "terrain_base_1":
-                case "terrain_base_1":
+                    this.m_terrainBase1 = (LLUUID)configuration_result;
-                    this.m_terrainBase1 = (LLUUID)configuration_result;
+                    break;
-                    break;
+                case "terrain_base_2":
-                case "terrain_base_2":
+                    this.m_terrainBase2 = (LLUUID)configuration_result;
-                    this.m_terrainBase2 = (LLUUID)configuration_result;
+                    break;
-                    break;
+                case "terrain_base_3":
-                case "terrain_base_3":
+                    this.m_terrainBase3 = (LLUUID)configuration_result;
-                    this.m_terrainBase3 = (LLUUID)configuration_result;
+                    break;
-                    break;
+                case "terrain_detail_0":
-                case "terrain_detail_0":
+                    this.m_terrainDetail0 = (LLUUID)configuration_result;
-                    this.m_terrainDetail0 = (LLUUID)configuration_result;
+                    break;
-                    break;
+                case "terrain_detail_1":
-                case "terrain_detail_1":
+                    this.m_terrainDetail1 = (LLUUID)configuration_result;
-                    this.m_terrainDetail1 = (LLUUID)configuration_result;
+                    break;
-                    break;
+                case "terrain_detail_2":
-                case "terrain_detail_2":
+                    this.m_terrainDetail2 = (LLUUID)configuration_result;
-                    this.m_terrainDetail2 = (LLUUID)configuration_result;
+                    break;
-                    break;
+                case "terrain_detail_3":
-                case "terrain_detail_3":
+                    this.m_terrainDetail3 = (LLUUID)configuration_result;
-                    this.m_terrainDetail3 = (LLUUID)configuration_result;
+                    break;
-                    break;
+                case "terrain_start_height_0":
-                case "terrain_start_height_0":
+                    this.m_terrainStartHeight0 = (float)configuration_result;
-                    this.m_terrainStartHeight0 = (float)configuration_result;
+                    break;
-                    break;
+                case "terrain_start_height_1":
-                case "terrain_start_height_1":
+                    this.m_terrainStartHeight1 = (float)configuration_result;
-                    this.m_terrainStartHeight1 = (float)configuration_result;
+                    break;
-                    break;
+                case "terrain_start_height_2":
-                case "terrain_start_height_2":
+                    this.m_terrainStartHeight2 = (float)configuration_result;
-                    this.m_terrainStartHeight2 = (float)configuration_result;
+                    break;
-                    break;
+                case "terrain_start_height_3":
-                case "terrain_start_height_3":
+                    this.m_terrainStartHeight3 = (float)configuration_result;
-                    this.m_terrainStartHeight3 = (float)configuration_result;
+                    break;
-                    break;
+                case "terrain_height_range_0":
-                case "terrain_height_range_0":
+                    this.m_terrainHeightRange0 = (float)configuration_result;
-                    this.m_terrainHeightRange0 = (float)configuration_result;
+                    break;
-                    break;
+                case "terrain_height_range_1":
-                case "terrain_height_range_1":
+                    this.m_terrainHeightRange1 = (float)configuration_result;
-                    this.m_terrainHeightRange1 = (float)configuration_result;
+                    break;
-                    break;
+                case "terrain_height_range_2":
-                case "terrain_height_range_2":
+                    this.m_terrainHeightRange2 = (float)configuration_result;
-                    this.m_terrainHeightRange2 = (float)configuration_result;
+                    break;
-                    break;
+                case "terrain_height_range_3":
-                case "terrain_height_range_3":
+                    this.m_terrainHeightRange3 = (float)configuration_result;
-                    this.m_terrainHeightRange3 = (float)configuration_result;
+                    break;
-                    break;
+                case "terrain_file":
-                case "terrain_file":
+                    this.m_terrainFile = (string)configuration_result;
-                    this.m_terrainFile = (string)configuration_result;
+                    break;
-                    break;
+                case "terrain_multiplier":
-                case "terrain_multiplier":
+                    this.m_terrainMultiplier = System.Convert.ToDouble(configuration_result);
-                    this.m_terrainMultiplier = System.Convert.ToDouble(configuration_result);
+                    break;
-                    break;
+                case "water_height":
-                case "water_height":
+                    double tmpVal = (double) configuration_result;
-                    double tmpVal = (double) configuration_result;
+                    this.m_waterHeight = (float) tmpVal;
-                    this.m_waterHeight = (float) tmpVal;
+                    break;
-                    break;
+                case "terrain_image_id":
-                case "terrain_image_id":
+                    this.m_terrainImageID = (LLUUID)configuration_result;
-                    this.m_terrainImageID = (LLUUID)configuration_result;
+                    break;
-                    break;
+            }
-            }
+            return true;
-            return true;
+        }
-        }
+    }
-    }
+}
-}