diff options
| author | Teravus Ovares (Dan Olivares) | 2009-09-09 16:20:46 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-09-09 16:20:46 -0400 |
| commit | df9f80aabd872c11711e1e4efb400a1921a9cab2 (patch) | |
| tree | a7d5582ed1d763224727c8a6bdf9c1c94a674abd /OpenSim/Region/Framework | |
| parent | * Lock timers when Calling Start() and Stop() when the Thread Context is murk... (diff) | |
| parent | De-hardcode default home locations on create user (standalone). (diff) | |
| download | opensim-SC-df9f80aabd872c11711e1e4efb400a1921a9cab2.zip opensim-SC-df9f80aabd872c11711e1e4efb400a1921a9cab2.tar.gz opensim-SC-df9f80aabd872c11711e1e4efb400a1921a9cab2.tar.bz2 opensim-SC-df9f80aabd872c11711e1e4efb400a1921a9cab2.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index d43a7e2..ecf0d80 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -1297,6 +1297,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1297 | m_log.Warn("[TERRAIN]: Scene.cs: LoadWorldMap() - Failed with exception " + e.ToString() + " Regenerating"); | 1297 | m_log.Warn("[TERRAIN]: Scene.cs: LoadWorldMap() - Failed with exception " + e.ToString() + " Regenerating"); |
| 1298 | 1298 | ||
| 1299 | // Non standard region size. If there's an old terrain in the database, it might read past the buffer | 1299 | // Non standard region size. If there's an old terrain in the database, it might read past the buffer |
| 1300 | #pragma warning disable 0162 | ||
| 1300 | if ((int)Constants.RegionSize != 256) | 1301 | if ((int)Constants.RegionSize != 256) |
| 1301 | { | 1302 | { |
| 1302 | Heightmap = new TerrainChannel(); | 1303 | Heightmap = new TerrainChannel(); |