Merge branch 'master' of ssh://MyConnection/var/git/opensim

This commit is contained in:
Teravus Ovares (Dan Olivares)
2009-09-09 16:20:46 -04:00
16 changed files with 492 additions and 136 deletions

View File

@@ -1297,6 +1297,7 @@ namespace OpenSim.Region.Framework.Scenes
m_log.Warn("[TERRAIN]: Scene.cs: LoadWorldMap() - Failed with exception " + e.ToString() + " Regenerating");
// Non standard region size. If there's an old terrain in the database, it might read past the buffer
#pragma warning disable 0162
if ((int)Constants.RegionSize != 256)
{
Heightmap = new TerrainChannel();