diff options
author | KittoFlora | 2009-11-02 21:53:51 +0100 |
---|---|---|
committer | KittoFlora | 2009-11-02 21:53:51 +0100 |
commit | 2ec022cf133534bbed4ca5e73fdb1d5a5a40bb3a (patch) | |
tree | e44fc76f1cb7154ecbdfa6e36f961fdc5be311c3 /OpenSim/Region/Physics/Manager/PhysicsScene.cs | |
parent | Merge branch 'master' into vehicles (diff) | |
parent | Removing Console.WriteLine()s that were brought in with the revert (diff) | |
download | opensim-SC-2ec022cf133534bbed4ca5e73fdb1d5a5a40bb3a.zip opensim-SC-2ec022cf133534bbed4ca5e73fdb1d5a5a40bb3a.tar.gz opensim-SC-2ec022cf133534bbed4ca5e73fdb1d5a5a40bb3a.tar.bz2 opensim-SC-2ec022cf133534bbed4ca5e73fdb1d5a5a40bb3a.tar.xz |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Region/Physics/Manager/PhysicsScene.cs')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index bb0d18e..6d515e9 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
@@ -75,6 +75,11 @@ namespace OpenSim.Region.Physics.Manager | |||
75 | public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, | 75 | public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, |
76 | Vector3 size, Quaternion rotation, bool isPhysical); | 76 | Vector3 size, Quaternion rotation, bool isPhysical); |
77 | 77 | ||
78 | public virtual float TimeDilation | ||
79 | { | ||
80 | get { return 1.0f; } | ||
81 | } | ||
82 | |||
78 | public virtual bool SupportsNINJAJoints | 83 | public virtual bool SupportsNINJAJoints |
79 | { | 84 | { |
80 | get { return false; } | 85 | get { return false; } |