aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
authorSean Dague2007-10-22 15:37:54 +0000
committerSean Dague2007-10-22 15:37:54 +0000
commit6acaabefc32525aed7ded45fc15e6152895d5382 (patch)
tree1350ddbde54e72c8d96719580a416cc2f0d85d24 /OpenSim/Region/Environment/Scenes/Scene.cs
parent* Major ass commit. (diff)
downloadopensim-SC_OLD-6acaabefc32525aed7ded45fc15e6152895d5382.zip
opensim-SC_OLD-6acaabefc32525aed7ded45fc15e6152895d5382.tar.gz
opensim-SC_OLD-6acaabefc32525aed7ded45fc15e6152895d5382.tar.bz2
opensim-SC_OLD-6acaabefc32525aed7ded45fc15e6152895d5382.tar.xz
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.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs8
1 files changed, 4 insertions, 4 deletions
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
370 phyScene.SetTerrain(Terrain.GetHeights1D()); 370 phyScene.SetTerrain(Terrain.GetHeights1D());
371 } 371 }
372 372
373 storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD(),RegionInfo.RegionID); 373 storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD());
374 374
375 float[] terData = Terrain.GetHeights1D(); 375 float[] terData = Terrain.GetHeights1D();
376 376
@@ -466,7 +466,7 @@ namespace OpenSim.Region.Environment.Scenes
466 { 466 {
467 try 467 try
468 { 468 {
469 double[,] map = storageManager.DataStore.LoadTerrain(RegionInfo.RegionID); 469 double[,] map = storageManager.DataStore.LoadTerrain();
470 if (map == null) 470 if (map == null)
471 { 471 {
472 if (string.IsNullOrEmpty(m_regInfo.estateSettings.terrainFile)) 472 if (string.IsNullOrEmpty(m_regInfo.estateSettings.terrainFile))
@@ -474,7 +474,7 @@ namespace OpenSim.Region.Environment.Scenes
474 MainLog.Instance.Verbose("TERRAIN", "No default terrain. Generating a new terrain."); 474 MainLog.Instance.Verbose("TERRAIN", "No default terrain. Generating a new terrain.");
475 Terrain.HillsGenerator(); 475 Terrain.HillsGenerator();
476 476
477 storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD(),RegionInfo.RegionID); 477 storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD());
478 } 478 }
479 else 479 else
480 { 480 {
@@ -488,7 +488,7 @@ namespace OpenSim.Region.Environment.Scenes
488 MainLog.Instance.Verbose("TERRAIN", "No terrain found in database or default. Generating a new terrain."); 488 MainLog.Instance.Verbose("TERRAIN", "No terrain found in database or default. Generating a new terrain.");
489 Terrain.HillsGenerator(); 489 Terrain.HillsGenerator();
490 } 490 }
491 storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD(), RegionInfo.RegionID); 491 storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD());
492 } 492 }
493 } 493 }
494 else 494 else