aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2009-08-07 23:06:52 +0100
committerMelanie2009-08-07 23:06:52 +0100
commit9337a94f33eb80ed4e031256ffd45a3f74294977 (patch)
tree851c648c79a2f4bdca9f929fc27bff1a8cbd84e9 /OpenSim/Region/Framework
parentRemove debugging output frm ini file loading. Make it collect matching (diff)
parent* Remove hard coded 256 limitations from various places. There's no more 2... (diff)
downloadopensim-SC-9337a94f33eb80ed4e031256ffd45a3f74294977.zip
opensim-SC-9337a94f33eb80ed4e031256ffd45a3f74294977.tar.gz
opensim-SC-9337a94f33eb80ed4e031256ffd45a3f74294977.tar.bz2
opensim-SC-9337a94f33eb80ed4e031256ffd45a3f74294977.tar.xz
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs13
1 files changed, 13 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index b48cf62..e344da3 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1192,6 +1192,19 @@ namespace OpenSim.Region.Framework.Scenes
1192 Heightmap = new TerrainChannel(map); 1192 Heightmap = new TerrainChannel(map);
1193 } 1193 }
1194 } 1194 }
1195 catch (IOException e)
1196 {
1197
1198 m_log.Warn("[TERRAIN]: Scene.cs: LoadWorldMap() - Failed with exception " + e.ToString() + " Regenerating");
1199
1200 // Non standard region size. If there's an old terrain in the database, it might read past the buffer
1201 if ((int)Constants.RegionSize != 256)
1202 {
1203 Heightmap = new TerrainChannel();
1204
1205 m_storageManager.DataStore.StoreTerrain(Heightmap.GetDoubles(), RegionInfo.RegionID);
1206 }
1207 }
1195 catch (Exception e) 1208 catch (Exception e)
1196 { 1209 {
1197 m_log.Warn("[TERRAIN]: Scene.cs: LoadWorldMap() - Failed with exception " + e.ToString()); 1210 m_log.Warn("[TERRAIN]: Scene.cs: LoadWorldMap() - Failed with exception " + e.ToString());