diff options
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/OdePlugin.cs')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 3d25acd..f97b49b 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
@@ -350,18 +350,13 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
350 | #endif | 350 | #endif |
351 | } | 351 | } |
352 | 352 | ||
353 | // zero out a heightmap array float array (single dimention [flattened])) | 353 | // zero out a heightmap array float array (single dimension [flattened])) |
354 | if ((int)WorldExtents.X == 256 && (int)m_worldOffset.Y == 256) | 354 | if ((int)WorldExtents.X == 256 && (int)m_worldOffset.Y == 256) |
355 | _heightmap = new float[514*514]; | 355 | _heightmap = new float[514*514]; |
356 | else | 356 | else |
357 | _heightmap = new float[(((int)WorldExtents.Y + 2) * ((int)WorldExtents.X + 2))]; | 357 | _heightmap = new float[(((int)WorldExtents.Y + 2) * ((int)WorldExtents.X + 2))]; |
358 | _watermap = new float[258 * 258]; | 358 | _watermap = new float[258 * 258]; |
359 | 359 | ||
360 | |||
361 | |||
362 | |||
363 | |||
364 | |||
365 | // Zero out the prim spaces array (we split our space into smaller spaces so | 360 | // Zero out the prim spaces array (we split our space into smaller spaces so |
366 | // we can hit test less. | 361 | // we can hit test less. |
367 | } | 362 | } |
@@ -2206,7 +2201,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2206 | } | 2201 | } |
2207 | 2202 | ||
2208 | /// <summary> | 2203 | /// <summary> |
2209 | /// Called when a static prim moves. Allocates a space for the prim based on it's position | 2204 | /// Called when a static prim moves. Allocates a space for the prim based on its position |
2210 | /// </summary> | 2205 | /// </summary> |
2211 | /// <param name="geom">the pointer to the geom that moved</param> | 2206 | /// <param name="geom">the pointer to the geom that moved</param> |
2212 | /// <param name="pos">the position that the geom moved to</param> | 2207 | /// <param name="pos">the position that the geom moved to</param> |
@@ -3025,7 +3020,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
3025 | float[] returnarr = new float[262144]; | 3020 | float[] returnarr = new float[262144]; |
3026 | float[,] resultarr = new float[(int)WorldExtents.X, (int)WorldExtents.Y]; | 3021 | float[,] resultarr = new float[(int)WorldExtents.X, (int)WorldExtents.Y]; |
3027 | 3022 | ||
3028 | // Filling out the array into it's multi-dimentional components | 3023 | // Filling out the array into its multi-dimensional components |
3029 | for (int y = 0; y < WorldExtents.Y; y++) | 3024 | for (int y = 0; y < WorldExtents.Y; y++) |
3030 | { | 3025 | { |
3031 | for (int x = 0; x < WorldExtents.X; x++) | 3026 | for (int x = 0; x < WorldExtents.X; x++) |
@@ -3138,7 +3133,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
3138 | float[] returnarr = new float[262144]; | 3133 | float[] returnarr = new float[262144]; |
3139 | float[,] resultarr = new float[(int)WorldExtents.X,(int)WorldExtents.Y]; | 3134 | float[,] resultarr = new float[(int)WorldExtents.X,(int)WorldExtents.Y]; |
3140 | 3135 | ||
3141 | // Filling out the array into it's multi-dimentional components | 3136 | // Filling out the array into its multi-dimensional components |
3142 | for (int y = 0; y < WorldExtents.Y; y++) | 3137 | for (int y = 0; y < WorldExtents.Y; y++) |
3143 | { | 3138 | { |
3144 | for (int x = 0; x < WorldExtents.X; x++) | 3139 | for (int x = 0; x < WorldExtents.X; x++) |