aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorMelanie2010-05-10 03:57:44 +0100
committerMelanie2010-05-10 03:57:44 +0100
commit3e8ceb350972a1d00c4163fecd8172602cdcd865 (patch)
tree9a23412c280440ff1762999c2d93fdd2685d0196 /OpenSim/Region/Framework/Scenes/Scene.cs
parentFix a null ref on region crossing (diff)
parentOK, this really fixes it, I promise. (diff)
downloadopensim-SC-3e8ceb350972a1d00c4163fecd8172602cdcd865.zip
opensim-SC-3e8ceb350972a1d00c4163fecd8172602cdcd865.tar.gz
opensim-SC-3e8ceb350972a1d00c4163fecd8172602cdcd865.tar.bz2
opensim-SC-3e8ceb350972a1d00c4163fecd8172602cdcd865.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
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 c0fa7b4..edbef4c 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1823,7 +1823,7 @@ namespace OpenSim.Region.Framework.Scenes
1823 /// <summary> 1823 /// <summary>
1824 /// Create a terrain texture for this scene 1824 /// Create a terrain texture for this scene
1825 /// </summary> 1825 /// </summary>
1826 public void CreateTerrainTexture(bool temporary) 1826 public void CreateTerrainTexture()
1827 { 1827 {
1828 //create a texture asset of the terrain 1828 //create a texture asset of the terrain
1829 IMapImageGenerator terrain = RequestModuleInterface<IMapImageGenerator>(); 1829 IMapImageGenerator terrain = RequestModuleInterface<IMapImageGenerator>();
@@ -1841,7 +1841,9 @@ namespace OpenSim.Region.Framework.Scenes
1841 IWorldMapModule mapModule = RequestModuleInterface<IWorldMapModule>(); 1841 IWorldMapModule mapModule = RequestModuleInterface<IWorldMapModule>();
1842 1842
1843 if (mapModule != null) 1843 if (mapModule != null)
1844 mapModule.LazySaveGeneratedMaptile(data, temporary); 1844 mapModule.RegenerateMaptile(data);
1845 else
1846 m_log.DebugFormat("[SCENE]: MapModule is null, can't save maptile");
1845 } 1847 }
1846 } 1848 }
1847 1849