From 6acaabefc32525aed7ded45fc15e6152895d5382 Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Mon, 22 Oct 2007 15:37:54 +0000
Subject: revert r2162 as it completely clobbered all the work on the
 ChatModule by MW and myself.  Couldn't find Adam online after that rev went
 in.

---
 OpenSim/Region/Environment/Scenes/Scene.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes')

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index fe2e470..553e55f 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -370,7 +370,7 @@ namespace OpenSim.Region.Environment.Scenes
                         phyScene.SetTerrain(Terrain.GetHeights1D());
                     }
 
-                    storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD(),RegionInfo.RegionID);
+                    storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD());
 
                     float[] terData = Terrain.GetHeights1D();
 
@@ -466,7 +466,7 @@ namespace OpenSim.Region.Environment.Scenes
         {
             try
             {
-                double[,] map = storageManager.DataStore.LoadTerrain(RegionInfo.RegionID);
+                double[,] map = storageManager.DataStore.LoadTerrain();
                 if (map == null)
                 {
                     if (string.IsNullOrEmpty(m_regInfo.estateSettings.terrainFile))
@@ -474,7 +474,7 @@ namespace OpenSim.Region.Environment.Scenes
                         MainLog.Instance.Verbose("TERRAIN", "No default terrain. Generating a new terrain.");
                         Terrain.HillsGenerator();
 
-                        storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD(),RegionInfo.RegionID);
+                        storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD());
                     }
                     else
                     {
@@ -488,7 +488,7 @@ namespace OpenSim.Region.Environment.Scenes
                             MainLog.Instance.Verbose("TERRAIN", "No terrain found in database or default. Generating a new terrain.");
                             Terrain.HillsGenerator();
                         }
-                        storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD(), RegionInfo.RegionID);
+                        storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD());
                     }
                 }
                 else
-- 
cgit v1.1