aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
diff options
context:
space:
mode:
authorJeff Ames2008-02-20 18:38:20 +0000
committerJeff Ames2008-02-20 18:38:20 +0000
commita8cfbbe963529728acbab4d9936cb89af380d1ac (patch)
tree16a72fba3d15556f6702127e7cfb98aa9fb9cf81 /OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
parentFix exception when reading OpenSim.ini file. (diff)
downloadopensim-SC_OLD-a8cfbbe963529728acbab4d9936cb89af380d1ac.zip
opensim-SC_OLD-a8cfbbe963529728acbab4d9936cb89af380d1ac.tar.gz
opensim-SC_OLD-a8cfbbe963529728acbab4d9936cb89af380d1ac.tar.bz2
opensim-SC_OLD-a8cfbbe963529728acbab4d9936cb89af380d1ac.tar.xz
Minor cleanup.
Diffstat (limited to 'OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs')
-rw-r--r--OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs7
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
index 8482e4c..180e14c 100644
--- a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
+++ b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
@@ -13,7 +13,7 @@
13* names of its contributors may be used to endorse or promote products 13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission. 14* derived from this software without specific prior written permission.
15* 15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY 16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY 19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
@@ -81,7 +81,7 @@ namespace OpenSim.Region.Physics.BulletXPlugin
81 /// </summary> 81 /// </summary>
82 public class BulletXMaths 82 public class BulletXMaths
83 { 83 {
84 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 84 //private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
85 85
86 //Vector3 86 //Vector3
87 public static Vector3 PhysicsVectorToXnaVector3(PhysicsVector physicsVector) 87 public static Vector3 PhysicsVectorToXnaVector3(PhysicsVector physicsVector)
@@ -313,10 +313,9 @@ namespace OpenSim.Region.Physics.BulletXPlugin
313 313
314 bool needsCollision = base.NeedsCollision(bodyA, bodyB); 314 bool needsCollision = base.NeedsCollision(bodyA, bodyB);
315 315
316 //m_log.Debug("[BulletX]: A collision was detected between {0} and {1} --> {2}", nameA, nameB, 316 //m_log.DebugFormat("[BulletX]: A collision was detected between {0} and {1} --> {2}", nameA, nameB,
317 //needsCollision); 317 //needsCollision);
318 318
319
320 return needsCollision; 319 return needsCollision;
321 } 320 }
322 } 321 }