Terrain / Physics / Storage:

* Added terrain "taint" - if terrain is tainted, the terrain is marked as needing to be saved.
* Added check for taint in the Backup() routine, if taint is found, terrain is saved and physics engine is notified.

1 files changed, 9 insertions, 2 deletions

diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs
index 56f5edb..4d57f14 100644
--- a/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim.RegionServer/world/World.cs
@@ -282,7 +282,7 @@ namespace OpenSim.world
                 Console.WriteLine("creating new terrain");

                 this.Terrain.hills();

 

-                //this.localStorage.SaveMap(this.Terrain.map);

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

             }

             else

             {

@@ -423,7 +423,14 @@ namespace OpenSim.world
 

         public bool Backup()

         {

-

+            if (Terrain.tainted > 0)

+            {

+                Terrain.tainted = 0;

+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: Backup() - Terrain tainted, saving.");

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

+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: Backup() - Terrain saved, informing Physics.");

+                phyScene.SetTerrain(Terrain.getHeights1D());

+            }

             OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: Backup() - Backing up Primitives");

             foreach (libsecondlife.LLUUID UUID in Entities.Keys)

             {