Fixed inverted map texture problem.

Added(from trunk) the loading of terrain files defined in the region.xml files.

1 files changed, 23 insertions, 2 deletions

diff --git a/OpenSim/OpenSim.Region/Scenes/Scene.cs b/OpenSim/OpenSim.Region/Scenes/Scene.cs
index ca9a112..5744f1f 100644
--- a/OpenSim/OpenSim.Region/Scenes/Scene.cs
+++ b/OpenSim/OpenSim.Region/Scenes/Scene.cs
@@ -415,10 +415,31 @@ namespace OpenSim.Region.Scenes
                 float[] map = this.localStorage.LoadWorld();

                 if (map == null)

                 {

-                    Console.WriteLine("creating new terrain");

-                    this.Terrain.hills();

+                   // Console.WriteLine("creating new terrain");

+                   // this.Terrain.hills();

 

                    // this.localStorage.SaveMap(this.Terrain.getHeights1D());

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

+                    {

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

+                        this.Terrain.hills();

+

+                       // this.localStorage.SaveMap(this.Terrain.getHeights1D());

+                    }

+                    else

+                    {

+                        try

+                        {

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

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

+                        }

+                        catch

+                        {

+                            Console.WriteLine("Unable to load default terrain, procedurally generating instead...");

+                            Terrain.hills();

+                        }

+                       // this.localStorage.SaveMap(this.Terrain.getHeights1D());

+                    }

                 }

                 else

                 {