aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
authorJeff Ames2009-08-14 17:16:41 +0900
committerJeff Ames2009-08-16 17:14:21 +0900
commit9d9fcac0386ba6adc7a1f6c08f82bd5c0b6cd1d2 (patch)
tree49c1ee6dc94e0812f1aeb9212af99167a5abcf06 /OpenSim/Region/Physics
parentThanks dmiles for a patch that adds PacketType.RequestMultipleObjects Packet ... (diff)
downloadopensim-SC_OLD-9d9fcac0386ba6adc7a1f6c08f82bd5c0b6cd1d2.zip
opensim-SC_OLD-9d9fcac0386ba6adc7a1f6c08f82bd5c0b6cd1d2.tar.gz
opensim-SC_OLD-9d9fcac0386ba6adc7a1f6c08f82bd5c0b6cd1d2.tar.bz2
opensim-SC_OLD-9d9fcac0386ba6adc7a1f6c08f82bd5c0b6cd1d2.tar.xz
Misc cleanup.
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs13
1 files changed, 4 insertions, 9 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 8fdc5a7..b7030f1 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -347,18 +347,13 @@ namespace OpenSim.Region.Physics.OdePlugin
347 #endif 347 #endif
348 } 348 }
349 349
350 // zero out a heightmap array float array (single dimention [flattened])) 350 // zero out a heightmap array float array (single dimension [flattened]))
351 if ((int)Constants.RegionSize == 256) 351 if ((int)Constants.RegionSize == 256)
352 _heightmap = new float[514*514]; 352 _heightmap = new float[514*514];
353 else 353 else
354 _heightmap = new float[(((int)Constants.RegionSize + 2) * ((int)Constants.RegionSize + 2))]; 354 _heightmap = new float[(((int)Constants.RegionSize + 2) * ((int)Constants.RegionSize + 2))];
355 _watermap = new float[258 * 258]; 355 _watermap = new float[258 * 258];
356 356
357
358
359
360
361
362 // Zero out the prim spaces array (we split our space into smaller spaces so 357 // Zero out the prim spaces array (we split our space into smaller spaces so
363 // we can hit test less. 358 // we can hit test less.
364 } 359 }
@@ -2197,7 +2192,7 @@ namespace OpenSim.Region.Physics.OdePlugin
2197 } 2192 }
2198 2193
2199 /// <summary> 2194 /// <summary>
2200 /// Called when a static prim moves. Allocates a space for the prim based on it's position 2195 /// Called when a static prim moves. Allocates a space for the prim based on its position
2201 /// </summary> 2196 /// </summary>
2202 /// <param name="geom">the pointer to the geom that moved</param> 2197 /// <param name="geom">the pointer to the geom that moved</param>
2203 /// <param name="pos">the position that the geom moved to</param> 2198 /// <param name="pos">the position that the geom moved to</param>
@@ -3013,7 +3008,7 @@ namespace OpenSim.Region.Physics.OdePlugin
3013 float[] returnarr = new float[262144]; 3008 float[] returnarr = new float[262144];
3014 float[,] resultarr = new float[m_regionWidth, m_regionHeight]; 3009 float[,] resultarr = new float[m_regionWidth, m_regionHeight];
3015 3010
3016 // Filling out the array into it's multi-dimentional components 3011 // Filling out the array into its multi-dimensional components
3017 for (int y = 0; y < m_regionHeight; y++) 3012 for (int y = 0; y < m_regionHeight; y++)
3018 { 3013 {
3019 for (int x = 0; x < m_regionWidth; x++) 3014 for (int x = 0; x < m_regionWidth; x++)
@@ -3126,7 +3121,7 @@ namespace OpenSim.Region.Physics.OdePlugin
3126 float[] returnarr = new float[262144]; 3121 float[] returnarr = new float[262144];
3127 float[,] resultarr = new float[m_regionWidth,m_regionHeight]; 3122 float[,] resultarr = new float[m_regionWidth,m_regionHeight];
3128 3123
3129 // Filling out the array into it's multi-dimentional components 3124 // Filling out the array into its multi-dimensional components
3130 for (int y = 0; y < m_regionHeight; y++) 3125 for (int y = 0; y < m_regionHeight; y++)
3131 { 3126 {
3132 for (int x = 0; x < m_regionWidth; x++) 3127 for (int x = 0; x < m_regionWidth; x++)