aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
diff options
context:
space:
mode:
authorMelanie2010-12-25 00:04:46 +0000
committerMelanie2010-12-25 00:04:46 +0000
commit75010e5e1cbe73b362084d0731925ee5c54c9d25 (patch)
tree8dc01825df93ab781b532d7651948e80c2508c1a /OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
parentUpdate child prim group positions in moving vehicles (diff)
parentThis fixes mantis #5198 and related. Physics is not my expertise, so I'm not ... (diff)
downloadopensim-SC-75010e5e1cbe73b362084d0731925ee5c54c9d25.zip
opensim-SC-75010e5e1cbe73b362084d0731925ee5c54c9d25.tar.gz
opensim-SC-75010e5e1cbe73b362084d0731925ee5c54c9d25.tar.bz2
opensim-SC-75010e5e1cbe73b362084d0731925ee5c54c9d25.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODECharacter.cs')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 2a66060..0e7dd81 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -1127,6 +1127,11 @@ namespace OpenSim.Region.Physics.OdePlugin
1127 _position.Y = vec.Y; 1127 _position.Y = vec.Y;
1128 _position.Z = vec.Z; 1128 _position.Z = vec.Z;
1129 1129
1130 // I think we need to update the taintPosition too -- Diva 12/24/10
1131 m_taintPosition.X = vec.X;
1132 m_taintPosition.Y = vec.Y;
1133 m_taintPosition.Z = vec.Z;
1134
1130 // Did we move last? = zeroflag 1135 // Did we move last? = zeroflag
1131 // This helps keep us from sliding all over 1136 // This helps keep us from sliding all over
1132 1137