Merge commit 'f2132329a358db2c66c29501d35ef54eae8d6eed' into bigmerge

2026-08-11 20:05:33 +08:00 · 2011-10-25 01:52:19 +01:00
parent 3eb51e9a79 f2132329a3
commit 63cbdb9b2a
3 changed files with 195 additions and 129 deletions
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -188,7 +188,6 @@ namespace OpenSim.Region.Physics.Manager
        public virtual Vector3 GetJointAxis(PhysicsJoint joint)
        { return Vector3.Zero; }

-
        public abstract void AddPhysicsActorTaint(PhysicsActor prim);

        public abstract float Simulate(float timeStep);