aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorAdam Frisby2008-01-22 00:33:05 +0000
committerAdam Frisby2008-01-22 00:33:05 +0000
commit7d61705c3c669cea77536f6bad4383790277c167 (patch)
treebbed6281b4215da0f3475b83d24c2bada959ed6d /OpenSim/Region/Environment
parent* Added an army of exception handlers to the InterRegion logoff message (diff)
downloadopensim-SC_OLD-7d61705c3c669cea77536f6bad4383790277c167.zip
opensim-SC_OLD-7d61705c3c669cea77536f6bad4383790277c167.tar.gz
opensim-SC_OLD-7d61705c3c669cea77536f6bad4383790277c167.tar.bz2
opensim-SC_OLD-7d61705c3c669cea77536f6bad4383790277c167.tar.xz
* Renamed a number of TerrainEngine functions to conform naming standards better.
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs11
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 7175d83..64b9abb 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -685,7 +685,7 @@ namespace OpenSim.Region.Environment.Scenes
685 685
686 private void UpdateTerrain() 686 private void UpdateTerrain()
687 { 687 {
688 if (Terrain.Tainted() && !Terrain.StillEditing()) 688 if (Terrain.IsTainted() && !Terrain.IsUserStillEditing())
689 { 689 {
690 CreateTerrainTexture(true); 690 CreateTerrainTexture(true);
691 691
@@ -706,7 +706,7 @@ namespace OpenSim.Region.Environment.Scenes
706 { 706 {
707 for (int y = 0; y < 16; y++) 707 for (int y = 0; y < 16; y++)
708 { 708 {
709 if (Terrain.Tainted(x*16, y*16)) 709 if (Terrain.IsTainted(x*16, y*16))
710 { 710 {
711 client.SendLayerData(x, y, terData); 711 client.SendLayerData(x, y, terData);
712 } 712 }
@@ -807,6 +807,7 @@ namespace OpenSim.Region.Environment.Scenes
807 public void LoadWorldMap(string filename) 807 public void LoadWorldMap(string filename)
808 { 808 {
809 Terrain.LoadFromFileF32(filename); 809 Terrain.LoadFromFileF32(filename);
810 Terrain.SaveRevertMap();
810 } 811 }
811 812
812 /// <summary> 813 /// <summary>
@@ -823,7 +824,7 @@ namespace OpenSim.Region.Environment.Scenes
823 if (string.IsNullOrEmpty(m_regInfo.EstateSettings.terrainFile)) 824 if (string.IsNullOrEmpty(m_regInfo.EstateSettings.terrainFile))
824 { 825 {
825 MainLog.Instance.Verbose("TERRAIN", "No default terrain. Generating a new terrain."); 826 MainLog.Instance.Verbose("TERRAIN", "No default terrain. Generating a new terrain.");
826 Terrain.HillsGenerator(); 827 Terrain.SetDefaultTerrain();
827 828
828 m_storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD(), RegionInfo.RegionID); 829 m_storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD(), RegionInfo.RegionID);
829 } 830 }
@@ -838,7 +839,7 @@ namespace OpenSim.Region.Environment.Scenes
838 { 839 {
839 MainLog.Instance.Verbose("TERRAIN", 840 MainLog.Instance.Verbose("TERRAIN",
840 "No terrain found in database or default. Generating a new terrain."); 841 "No terrain found in database or default. Generating a new terrain.");
841 Terrain.HillsGenerator(); 842 Terrain.SetDefaultTerrain();
842 } 843 }
843 m_storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD(), RegionInfo.RegionID); 844 m_storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD(), RegionInfo.RegionID);
844 } 845 }
@@ -885,7 +886,7 @@ namespace OpenSim.Region.Environment.Scenes
885 public void CreateTerrainTexture(bool temporary) 886 public void CreateTerrainTexture(bool temporary)
886 { 887 {
887 //create a texture asset of the terrain 888 //create a texture asset of the terrain
888 byte[] data = Terrain.ExportJpegImage("defaultstripe.png"); 889 byte[] data = Terrain.WriteJpegImage("defaultstripe.png");
889 m_regInfo.EstateSettings.terrainImageID = LLUUID.Random(); 890 m_regInfo.EstateSettings.terrainImageID = LLUUID.Random();
890 AssetBase asset = new AssetBase(); 891 AssetBase asset = new AssetBase();
891 asset.FullID = m_regInfo.EstateSettings.terrainImageID; 892 asset.FullID = m_regInfo.EstateSettings.terrainImageID;