diff options
author | Melanie | 2011-12-22 16:52:14 +0000 |
---|---|---|
committer | Melanie | 2011-12-22 16:52:14 +0000 |
commit | 66a0471efa57401c2fa4a3115f1d1566bee83833 (patch) | |
tree | 29b1f09dc34865398320635f173b298ef1913e7d /OpenSim/Region | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Add a few comments, correct a merge artefact (diff) | |
download | opensim-SC-66a0471efa57401c2fa4a3115f1d1566bee83833.zip opensim-SC-66a0471efa57401c2fa4a3115f1d1566bee83833.tar.gz opensim-SC-66a0471efa57401c2fa4a3115f1d1566bee83833.tar.bz2 opensim-SC-66a0471efa57401c2fa4a3115f1d1566bee83833.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index b0a0046..88bf695 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -574,6 +574,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
574 | public Vector3 OffsetPosition | 574 | public Vector3 OffsetPosition |
575 | { | 575 | { |
576 | get { return m_pos; } | 576 | get { return m_pos; } |
577 | // Don't remove setter. It's not currently used in core but | ||
578 | // upcoming Avination code needs it. | ||
577 | set | 579 | set |
578 | { | 580 | { |
579 | // There is no offset position when not seated | 581 | // There is no offset position when not seated |
@@ -2762,7 +2764,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
2762 | if (IsChildAgent) | 2764 | if (IsChildAgent) |
2763 | return; | 2765 | return; |
2764 | 2766 | ||
2765 | if (ParentID != 0) | 2767 | // If we don't have a PhysActor, we can't cross anyway |
2768 | // Also don't do this while sat, sitting avatars cross with the | ||
2769 | // object they sit on. | ||
2770 | if (ParentID != 0 || PhysActor == null) | ||
2766 | return; | 2771 | return; |
2767 | 2772 | ||
2768 | if (!IsInTransit) | 2773 | if (!IsInTransit) |