From ee205e7e812e170f670e690a4e0fa9caa652f226 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Thu, 1 Oct 2009 01:00:09 +0900 Subject: Formatting cleanup. --- OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs | 4 ++-- OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs | 2 +- OpenSim/Region/Physics/Manager/VehicleConstants.cs | 2 +- OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs | 2 +- OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 10 +++++----- 5 files changed, 10 insertions(+), 10 deletions(-) (limited to 'OpenSim/Region/Physics') 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 { // Teravus: Kitto, this code causes recurring errors that stall physics permenantly unless // the values are checked, so checking below. - // Is there any reason that we don't do this in ScenePresence? + // Is there any reason that we don't do this in ScenePresence? // The only physics engine that benefits from it in the physics plugin is this one if (x > (int)Constants.RegionSize || y > (int)Constants.RegionSize || @@ -650,7 +650,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin if (iPropertiesNotSupportedDefault == 0) { -#if SPAM +#if SPAM m_log.Warn("NonMesh"); #endif 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 plugHard = new ZeroMesherPlugin(); _MeshPlugins.Add(plugHard.GetName(), plugHard); - m_log.Info("[PHYSICS]: Added meshing engine: " + plugHard.GetName()); + m_log.Info("[PHYSICS]: Added meshing engine: " + plugHard.GetName()); } /// 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 BANKING_TIMESCALE = 40, REFERENCE_FRAME = 44 - } + } [Flags] 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 mono [0x81d28b6] mono [0x81ea2c6] /lib/i686/cmov/libpthread.so.0 [0xb7e744c0] - /lib/i686/cmov/libc.so.6(clone+0x5e) [0xb7dcd6de] + /lib/i686/cmov/libc.so.6(clone+0x5e) [0xb7dcd6de] */ // 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 if (iPropertiesNotSupportedDefault == 0) { -#if SPAM +#if SPAM m_log.Warn("NonMesh"); #endif return false; @@ -3334,7 +3334,7 @@ namespace OpenSim.Region.Physics.OdePlugin { // this._heightmap[i] = (double)heightMap[i]; // dbm (danx0r) -- creating a buffer zone of one extra sample all around - //_origheightmap = heightMap; + //_origheightmap = heightMap; float[] _heightmap; @@ -3520,16 +3520,16 @@ namespace OpenSim.Region.Physics.OdePlugin d.GeomDestroy(g); //removingHeightField = new float[0]; - } + } } } else { m_log.Warn("[PHYSICS]: Couldn't proceed with UnCombine. Region has inconsistant data."); } - } + } } - } + } public override void SetWaterLevel(float baseheight) { -- cgit v1.1 From 606e831ff5337fb5e94dcebf9d6852bd4c434d4b Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Thu, 1 Oct 2009 09:38:36 +0900 Subject: Formatting cleanup. --- OpenSim/Region/Physics/Manager/PhysicsScene.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'OpenSim/Region/Physics') 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 } /// - /// Queue a raycast against the physics scene. + /// Queue a raycast against the physics scene. /// The provided callback method will be called when the raycast is complete /// /// Many physics engines don't support collision testing at the same time as /// manipulating the physics scene, so we queue the request up and callback - /// a custom method when the raycast is complete. + /// a custom method when the raycast is complete. /// This allows physics engines that give an immediate result to callback immediately /// and ones that don't, to callback when it gets a result back. /// -- cgit v1.1