diff options
author | Melanie | 2013-01-18 19:35:09 +0000 |
---|---|---|
committer | Melanie | 2013-01-18 19:35:09 +0000 |
commit | 9aad815177c76580e74b941b8af429335d1c259c (patch) | |
tree | c0ea29b07d6178e5c1982fa52067787154101aa8 /OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-9aad815177c76580e74b941b8af429335d1c259c.zip opensim-SC-9aad815177c76580e74b941b8af429335d1c259c.tar.gz opensim-SC-9aad815177c76580e74b941b8af429335d1c259c.tar.bz2 opensim-SC-9aad815177c76580e74b941b8af429335d1c259c.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs index 6601479..f2c7cec 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | |||
@@ -35,6 +35,7 @@ using System.Collections.Generic; | |||
35 | using System.Reflection; | 35 | using System.Reflection; |
36 | using System.Runtime.InteropServices; | 36 | using System.Runtime.InteropServices; |
37 | using OpenMetaverse; | 37 | using OpenMetaverse; |
38 | using OpenSim.Framework; | ||
38 | using OpenSim.Region.Physics.Manager; | 39 | using OpenSim.Region.Physics.Manager; |
39 | 40 | ||
40 | namespace OpenSim.Region.Physics.BulletSPlugin | 41 | namespace OpenSim.Region.Physics.BulletSPlugin |
@@ -154,7 +155,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
154 | // Return 'true' if this vehicle is doing vehicle things | 155 | // Return 'true' if this vehicle is doing vehicle things |
155 | public bool IsActive | 156 | public bool IsActive |
156 | { | 157 | { |
157 | get { return (Type != Vehicle.TYPE_NONE && !Prim.IsStatic); } | 158 | get { return (Type != Vehicle.TYPE_NONE && Prim.IsPhysicallyActive); } |
158 | } | 159 | } |
159 | 160 | ||
160 | #region Vehicle parameter setting | 161 | #region Vehicle parameter setting |