diff options
Diffstat (limited to '')
6 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs index e0f856a..18d4bab 100644 --- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs +++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs | |||
@@ -528,7 +528,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
528 | { | 528 | { |
529 | // Teravus: Kitto, this code causes recurring errors that stall physics permenantly unless | 529 | // Teravus: Kitto, this code causes recurring errors that stall physics permenantly unless |
530 | // the values are checked, so checking below. | 530 | // the values are checked, so checking below. |
531 | // Is there any reason that we don't do this in ScenePresence? | 531 | // Is there any reason that we don't do this in ScenePresence? |
532 | // The only physics engine that benefits from it in the physics plugin is this one | 532 | // The only physics engine that benefits from it in the physics plugin is this one |
533 | 533 | ||
534 | if (x > (int)Constants.RegionSize || y > (int)Constants.RegionSize || | 534 | if (x > (int)Constants.RegionSize || y > (int)Constants.RegionSize || |
@@ -650,7 +650,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
650 | 650 | ||
651 | if (iPropertiesNotSupportedDefault == 0) | 651 | if (iPropertiesNotSupportedDefault == 0) |
652 | { | 652 | { |
653 | #if SPAM | 653 | #if SPAM |
654 | m_log.Warn("NonMesh"); | 654 | m_log.Warn("NonMesh"); |
655 | #endif | 655 | #endif |
656 | return false; | 656 | return false; |
diff --git a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs index ce52744..7130a3e 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs | |||
@@ -55,7 +55,7 @@ namespace OpenSim.Region.Physics.Manager | |||
55 | plugHard = new ZeroMesherPlugin(); | 55 | plugHard = new ZeroMesherPlugin(); |
56 | _MeshPlugins.Add(plugHard.GetName(), plugHard); | 56 | _MeshPlugins.Add(plugHard.GetName(), plugHard); |
57 | 57 | ||
58 | m_log.Info("[PHYSICS]: Added meshing engine: " + plugHard.GetName()); | 58 | m_log.Info("[PHYSICS]: Added meshing engine: " + plugHard.GetName()); |
59 | } | 59 | } |
60 | 60 | ||
61 | /// <summary> | 61 | /// <summary> |
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index 8a07f71..6dd26bb 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
@@ -178,12 +178,12 @@ namespace OpenSim.Region.Physics.Manager | |||
178 | } | 178 | } |
179 | 179 | ||
180 | /// <summary> | 180 | /// <summary> |
181 | /// Queue a raycast against the physics scene. | 181 | /// Queue a raycast against the physics scene. |
182 | /// The provided callback method will be called when the raycast is complete | 182 | /// The provided callback method will be called when the raycast is complete |
183 | /// | 183 | /// |
184 | /// Many physics engines don't support collision testing at the same time as | 184 | /// Many physics engines don't support collision testing at the same time as |
185 | /// manipulating the physics scene, so we queue the request up and callback | 185 | /// manipulating the physics scene, so we queue the request up and callback |
186 | /// a custom method when the raycast is complete. | 186 | /// a custom method when the raycast is complete. |
187 | /// This allows physics engines that give an immediate result to callback immediately | 187 | /// This allows physics engines that give an immediate result to callback immediately |
188 | /// and ones that don't, to callback when it gets a result back. | 188 | /// and ones that don't, to callback when it gets a result back. |
189 | /// | 189 | /// |
diff --git a/OpenSim/Region/Physics/Manager/VehicleConstants.cs b/OpenSim/Region/Physics/Manager/VehicleConstants.cs index 97f66d3..532e55e 100644 --- a/OpenSim/Region/Physics/Manager/VehicleConstants.cs +++ b/OpenSim/Region/Physics/Manager/VehicleConstants.cs | |||
@@ -93,7 +93,7 @@ namespace OpenSim.Region.Physics.Manager | |||
93 | BANKING_TIMESCALE = 40, | 93 | BANKING_TIMESCALE = 40, |
94 | REFERENCE_FRAME = 44 | 94 | REFERENCE_FRAME = 44 |
95 | 95 | ||
96 | } | 96 | } |
97 | 97 | ||
98 | [Flags] | 98 | [Flags] |
99 | public enum VehicleFlag | 99 | public enum VehicleFlag |
diff --git a/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs b/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs index d9f4951..c8ae229 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs | |||
@@ -228,7 +228,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
228 | mono [0x81d28b6] | 228 | mono [0x81d28b6] |
229 | mono [0x81ea2c6] | 229 | mono [0x81ea2c6] |
230 | /lib/i686/cmov/libpthread.so.0 [0xb7e744c0] | 230 | /lib/i686/cmov/libpthread.so.0 [0xb7e744c0] |
231 | /lib/i686/cmov/libc.so.6(clone+0x5e) [0xb7dcd6de] | 231 | /lib/i686/cmov/libc.so.6(clone+0x5e) [0xb7dcd6de] |
232 | */ | 232 | */ |
233 | 233 | ||
234 | // Exclude heightfield geom | 234 | // Exclude heightfield geom |
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 94223d8..0769c90 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
@@ -2536,7 +2536,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2536 | 2536 | ||
2537 | if (iPropertiesNotSupportedDefault == 0) | 2537 | if (iPropertiesNotSupportedDefault == 0) |
2538 | { | 2538 | { |
2539 | #if SPAM | 2539 | #if SPAM |
2540 | m_log.Warn("NonMesh"); | 2540 | m_log.Warn("NonMesh"); |
2541 | #endif | 2541 | #endif |
2542 | return false; | 2542 | return false; |
@@ -3334,7 +3334,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
3334 | { | 3334 | { |
3335 | // this._heightmap[i] = (double)heightMap[i]; | 3335 | // this._heightmap[i] = (double)heightMap[i]; |
3336 | // dbm (danx0r) -- creating a buffer zone of one extra sample all around | 3336 | // dbm (danx0r) -- creating a buffer zone of one extra sample all around |
3337 | //_origheightmap = heightMap; | 3337 | //_origheightmap = heightMap; |
3338 | 3338 | ||
3339 | float[] _heightmap; | 3339 | float[] _heightmap; |
3340 | 3340 | ||
@@ -3520,16 +3520,16 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
3520 | 3520 | ||
3521 | d.GeomDestroy(g); | 3521 | d.GeomDestroy(g); |
3522 | //removingHeightField = new float[0]; | 3522 | //removingHeightField = new float[0]; |
3523 | } | 3523 | } |
3524 | } | 3524 | } |
3525 | } | 3525 | } |
3526 | else | 3526 | else |
3527 | { | 3527 | { |
3528 | m_log.Warn("[PHYSICS]: Couldn't proceed with UnCombine. Region has inconsistant data."); | 3528 | m_log.Warn("[PHYSICS]: Couldn't proceed with UnCombine. Region has inconsistant data."); |
3529 | } | 3529 | } |
3530 | } | 3530 | } |
3531 | } | 3531 | } |
3532 | } | 3532 | } |
3533 | 3533 | ||
3534 | public override void SetWaterLevel(float baseheight) | 3534 | public override void SetWaterLevel(float baseheight) |
3535 | { | 3535 | { |