aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
authorAdam Frisby2007-09-25 11:48:43 +0000
committerAdam Frisby2007-09-25 11:48:43 +0000
commit569ba9eb9acb9f024060a41ee4188a11aafa3fa7 (patch)
tree63cec15a6c0338a8777640ed13fd7c3ce05eeba7 /OpenSim/Region/Environment/Scenes/Scene.cs
parentfix order issue with prebuild.xml, we need to build Local before (diff)
downloadopensim-SC_OLD-569ba9eb9acb9f024060a41ee4188a11aafa3fa7.zip
opensim-SC_OLD-569ba9eb9acb9f024060a41ee4188a11aafa3fa7.tar.gz
opensim-SC_OLD-569ba9eb9acb9f024060a41ee4188a11aafa3fa7.tar.bz2
opensim-SC_OLD-569ba9eb9acb9f024060a41ee4188a11aafa3fa7.tar.xz
Terrain:
* Attempted fix for lag/pause when doing lots of updates. * Some naming fixes to libTerrain. * Refactored terrain bitmap generation into a common call for both world map and export. General: * Switched some calls to Console.WriteLine to use MainLog.Warn/Verbose/Notice.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 7381930..8ad8147 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -354,7 +354,7 @@ namespace OpenSim.Region.Environment.Scenes
354 354
355 private void UpdateTerrain() 355 private void UpdateTerrain()
356 { 356 {
357 if (Terrain.Tainted()) 357 if (Terrain.Tainted() && !Terrain.StillEditing())
358 { 358 {
359 CreateTerrainTexture(); 359 CreateTerrainTexture();
360 360
@@ -466,7 +466,7 @@ namespace OpenSim.Region.Environment.Scenes
466 { 466 {
467 if (string.IsNullOrEmpty(m_regInfo.estateSettings.terrainFile)) 467 if (string.IsNullOrEmpty(m_regInfo.estateSettings.terrainFile))
468 { 468 {
469 Console.WriteLine("No default terrain, procedurally generating..."); 469 MainLog.Instance.Verbose("TERRAIN", "No default terrain. Generating a new terrain.");
470 Terrain.HillsGenerator(); 470 Terrain.HillsGenerator();
471 471
472 storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD()); 472 storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD());
@@ -480,7 +480,7 @@ namespace OpenSim.Region.Environment.Scenes
480 } 480 }
481 catch 481 catch
482 { 482 {
483 Console.WriteLine("Unable to load default terrain, procedurally generating instead..."); 483 MainLog.Instance.Verbose("TERRAIN","No terrain found in database or default. Generating a new terrain.");
484 Terrain.HillsGenerator(); 484 Terrain.HillsGenerator();
485 } 485 }
486 storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD()); 486 storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD());