aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2010-12-03 19:04:59 +0100
committerMelanie2010-12-03 19:04:59 +0100
commit60b055de4c05fa68eb28ea67de76aa425261b9f1 (patch)
treed09dc61c7b074c80e8bfa59e9b9500926372e8f8 /OpenSim/Region
parentFix status responses in remote admin (diff)
parentFix spurious Av move when clothing item worn or removed. (diff)
downloadopensim-SC-60b055de4c05fa68eb28ea67de76aa425261b9f1.zip
opensim-SC-60b055de4c05fa68eb28ea67de76aa425261b9f1.tar.gz
opensim-SC-60b055de4c05fa68eb28ea67de76aa425261b9f1.tar.bz2
opensim-SC-60b055de4c05fa68eb28ea67de76aa425261b9f1.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs
index 505d455..93f9964 100644
--- a/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs
@@ -469,7 +469,7 @@ namespace OpenSim.Region.Physics.OdePlugin
469 //m_log.Info("[SIZE]: " + CAPSULE_LENGTH.ToString()); 469 //m_log.Info("[SIZE]: " + CAPSULE_LENGTH.ToString());
470 470
471 Velocity = Vector3.Zero; 471 Velocity = Vector3.Zero;
472 472 m_taintPosition = _position; // update the stale taint position
473 _parent_scene.AddPhysicsActorTaint(this); 473 _parent_scene.AddPhysicsActorTaint(this);
474 } 474 }
475 else 475 else