aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
diff options
context:
space:
mode:
authorubit2012-05-28 23:25:51 +0200
committerubit2012-05-28 23:25:51 +0200
commit4f08dae24b98e340d79fe6e2b1790790e880a9ac (patch)
tree95d340572ba2dac00fcf7c88fdfe2b8ffb287c08 /OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parent fix avatars collisions on sim crossings and other few cases where freemove()... (diff)
downloadopensim-SC-4f08dae24b98e340d79fe6e2b1790790e880a9ac.zip
opensim-SC-4f08dae24b98e340d79fe6e2b1790790e880a9ac.tar.gz
opensim-SC-4f08dae24b98e340d79fe6e2b1790790e880a9ac.tar.bz2
opensim-SC-4f08dae24b98e340d79fe6e2b1790790e880a9ac.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs')
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
index 6fb54cb..093bc3c 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
@@ -1322,8 +1322,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1322 m_iscollidingGround = false; 1322 m_iscollidingGround = false;
1323 m_iscollidingObj = false; 1323 m_iscollidingObj = false;
1324 1324
1325 CollisionEventsThisFrame = new CollisionEventUpdate(); 1325 CollisionEventsThisFrame.Clear();
1326 m_eventsubscription = 0;
1327 } 1326 }
1328 1327
1329 private void changeForce(Vector3 newForce) 1328 private void changeForce(Vector3 newForce)