From 569ba9eb9acb9f024060a41ee4188a11aafa3fa7 Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Tue, 25 Sep 2007 11:48:43 +0000 Subject: 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. --- OpenSim/Region/Environment/Scenes/Scene.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs') 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 private void UpdateTerrain() { - if (Terrain.Tainted()) + if (Terrain.Tainted() && !Terrain.StillEditing()) { CreateTerrainTexture(); @@ -466,7 +466,7 @@ namespace OpenSim.Region.Environment.Scenes { if (string.IsNullOrEmpty(m_regInfo.estateSettings.terrainFile)) { - Console.WriteLine("No default terrain, procedurally generating..."); + MainLog.Instance.Verbose("TERRAIN", "No default terrain. Generating a new terrain."); Terrain.HillsGenerator(); storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD()); @@ -480,7 +480,7 @@ namespace OpenSim.Region.Environment.Scenes } catch { - Console.WriteLine("Unable to load default terrain, procedurally generating instead..."); + MainLog.Instance.Verbose("TERRAIN","No terrain found in database or default. Generating a new terrain."); Terrain.HillsGenerator(); } storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD()); -- cgit v1.1