*Added EstateSettings.cs and moved many relevant variables from RegionInfoBase to EstateSettings class and added an EstateSettings objection to RegionInfoBase

*Added a few missed copyright headers
*Fixed a filename typo

1 files changed, 3 insertions, 3 deletions

diff --git a/OpenSim/OpenSim.RegionServer/Simulator/World.cs b/OpenSim/OpenSim.RegionServer/Simulator/World.cs
index 150a092..b4e4f49 100644
--- a/OpenSim/OpenSim.RegionServer/Simulator/World.cs
+++ b/OpenSim/OpenSim.RegionServer/Simulator/World.cs
@@ -463,7 +463,7 @@ namespace OpenSim.RegionServer.Simulator
                 float[] map = this.localStorage.LoadWorld();

                 if (map == null)

                 {

-                    if (string.IsNullOrEmpty(this.m_regInfo.TerrainFile))

+                    if (string.IsNullOrEmpty(this.m_regInfo.estateSettings.terrainFile))

                     {

                         Console.WriteLine("No default terrain, procedurally generating...");

                         this.Terrain.hills();

@@ -474,8 +474,8 @@ namespace OpenSim.RegionServer.Simulator
                     {

                         try

                         {

-                            this.Terrain.loadFromFileF32(this.m_regInfo.TerrainFile);

-                            this.Terrain *= this.m_regInfo.TerrainMultiplier;

+                            this.Terrain.loadFromFileF32(this.m_regInfo.estateSettings.terrainFile);

+                            this.Terrain *= this.m_regInfo.estateSettings.terrainMultiplier;

                         }

                         catch (Exception e)

                         {