aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2009-08-08 10:38:53 -0400
committerTeravus Ovares (Dan Olivares)2009-08-08 10:38:53 -0400
commite88903f481fd5e3e27980749febea64924208573 (patch)
treef8b3825bee3f1f9b9b42b97628326cbe38a0275c /OpenSim/Region/Physics
parentMerge branch 'master' of ssh://MyConnection/var/git/opensim (diff)
downloadopensim-SC_OLD-e88903f481fd5e3e27980749febea64924208573.zip
opensim-SC_OLD-e88903f481fd5e3e27980749febea64924208573.tar.gz
opensim-SC_OLD-e88903f481fd5e3e27980749febea64924208573.tar.bz2
opensim-SC_OLD-e88903f481fd5e3e27980749febea64924208573.tar.xz
* Fix one physics crash for regions larger then 512mx512m
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 50dc91d..e435ac1 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -350,7 +350,10 @@ namespace OpenSim.Region.Physics.OdePlugin
350 } 350 }
351 351
352 // zero out a heightmap array float array (single dimention [flattened])) 352 // zero out a heightmap array float array (single dimention [flattened]))
353 _heightmap = new float[514*514]; 353 if ((int)Constants.RegionSize == 256)
354 _heightmap = new float[514*514];
355 else
356 _heightmap = new float[(((int)Constants.RegionSize + 2) * ((int)Constants.RegionSize + 2))];
354 _watermap = new float[258 * 258]; 357 _watermap = new float[258 * 258];
355 358
356 359