aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
diff options
context:
space:
mode:
authorUbitUmarov2012-03-04 01:40:12 +0000
committerUbitUmarov2012-03-04 01:40:12 +0000
commit7c931037bd9d43b7de52534870ad15a645fe67d6 (patch)
tree5a06008ccbced0e367ea6921c984e2fd63115cf4 /OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
parentMerge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
downloadopensim-SC_OLD-7c931037bd9d43b7de52534870ad15a645fe67d6.zip
opensim-SC_OLD-7c931037bd9d43b7de52534870ad15a645fe67d6.tar.gz
opensim-SC_OLD-7c931037bd9d43b7de52534870ad15a645fe67d6.tar.bz2
opensim-SC_OLD-7c931037bd9d43b7de52534870ad15a645fe67d6.tar.xz
update UbitODE
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs')
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs12
1 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
index 17f38e8..e5fa1d7 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
@@ -222,6 +222,18 @@ namespace OpenSim.Region.Physics.OdePlugin
222 { 222 {
223 get 223 get
224 { 224 {
225 if (m_isphysical)
226 {
227 ODEDynamics veh;
228 if (_parent != null)
229 veh = ((OdePrim)_parent).m_vehicle;
230 else
231 veh = m_vehicle;
232
233 if (veh != null)
234 if (veh.Type != Vehicle.TYPE_NONE && veh.EngineActive)
235 return new ContactData(0, 0);
236 }
225 return primContactData; 237 return primContactData;
226 } 238 }
227 } 239 }