aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Manager
diff options
context:
space:
mode:
authorMelanie2011-10-25 01:52:19 +0100
committerMelanie2011-10-25 01:52:19 +0100
commit63cbdb9b2a6984bef5a451191c369ae94f2e93fb (patch)
tree823f7512ad88d5200defeb0c33328af947cc4d8b /OpenSim/Region/Physics/Manager
parentMerge commit 'bea65b06a445c267ecb77be08452146cb7fee1ce' into bigmerge (diff)
parentrefactor: make methods that do not need to be public in ODE private or intern... (diff)
downloadopensim-SC_OLD-63cbdb9b2a6984bef5a451191c369ae94f2e93fb.zip
opensim-SC_OLD-63cbdb9b2a6984bef5a451191c369ae94f2e93fb.tar.gz
opensim-SC_OLD-63cbdb9b2a6984bef5a451191c369ae94f2e93fb.tar.bz2
opensim-SC_OLD-63cbdb9b2a6984bef5a451191c369ae94f2e93fb.tar.xz
Merge commit 'f2132329a358db2c66c29501d35ef54eae8d6eed' into bigmerge
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsScene.cs1
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 30623a0..e3b222c 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -188,7 +188,6 @@ namespace OpenSim.Region.Physics.Manager
188 public virtual Vector3 GetJointAxis(PhysicsJoint joint) 188 public virtual Vector3 GetJointAxis(PhysicsJoint joint)
189 { return Vector3.Zero; } 189 { return Vector3.Zero; }
190 190
191
192 public abstract void AddPhysicsActorTaint(PhysicsActor prim); 191 public abstract void AddPhysicsActorTaint(PhysicsActor prim);
193 192
194 public abstract float Simulate(float timeStep); 193 public abstract float Simulate(float timeStep);