aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorMelanie2010-05-10 04:05:04 +0100
committerMelanie2010-05-10 04:05:04 +0100
commitfada4cb6c483c34a286792a92eeab1bd289dd76c (patch)
tree55d97abbdee19360d3fc8a0546e4315d4a0f096d /OpenSim/Region/Framework/Scenes/Scene.cs
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentReturn agents when angle is PI (diff)
downloadopensim-SC_OLD-fada4cb6c483c34a286792a92eeab1bd289dd76c.zip
opensim-SC_OLD-fada4cb6c483c34a286792a92eeab1bd289dd76c.tar.gz
opensim-SC_OLD-fada4cb6c483c34a286792a92eeab1bd289dd76c.tar.bz2
opensim-SC_OLD-fada4cb6c483c34a286792a92eeab1bd289dd76c.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 122ed02..e920ff5 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1851,7 +1851,7 @@ namespace OpenSim.Region.Framework.Scenes
1851 /// <summary> 1851 /// <summary>
1852 /// Create a terrain texture for this scene 1852 /// Create a terrain texture for this scene
1853 /// </summary> 1853 /// </summary>
1854 public void CreateTerrainTexture(bool temporary) 1854 public void CreateTerrainTexture()
1855 { 1855 {
1856 //create a texture asset of the terrain 1856 //create a texture asset of the terrain
1857 IMapImageGenerator terrain = RequestModuleInterface<IMapImageGenerator>(); 1857 IMapImageGenerator terrain = RequestModuleInterface<IMapImageGenerator>();
@@ -1869,7 +1869,9 @@ namespace OpenSim.Region.Framework.Scenes
1869 IWorldMapModule mapModule = RequestModuleInterface<IWorldMapModule>(); 1869 IWorldMapModule mapModule = RequestModuleInterface<IWorldMapModule>();
1870 1870
1871 if (mapModule != null) 1871 if (mapModule != null)
1872 mapModule.LazySaveGeneratedMaptile(data, temporary); 1872 mapModule.RegenerateMaptile(data);
1873 else
1874 m_log.DebugFormat("[SCENE]: MapModule is null, can't save maptile");
1873 } 1875 }
1874 } 1876 }
1875 1877