aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2011-12-22 16:51:51 +0000
committerMelanie2011-12-22 16:51:51 +0000
commit6412349decb36a7278528477bacb5b71534ad657 (patch)
treec010ab9ae317fca8887680fb623a65c6b689447b /OpenSim
parentHarmonizing SP with Avination (diff)
downloadopensim-SC_OLD-6412349decb36a7278528477bacb5b71534ad657.zip
opensim-SC_OLD-6412349decb36a7278528477bacb5b71534ad657.tar.gz
opensim-SC_OLD-6412349decb36a7278528477bacb5b71534ad657.tar.bz2
opensim-SC_OLD-6412349decb36a7278528477bacb5b71534ad657.tar.xz
Add a few comments, correct a merge artefact
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index c578fc0..fc6eb6d 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -570,6 +570,8 @@ namespace OpenSim.Region.Framework.Scenes
570 public Vector3 OffsetPosition 570 public Vector3 OffsetPosition
571 { 571 {
572 get { return m_pos; } 572 get { return m_pos; }
573 // Don't remove setter. It's not currently used in core but
574 // upcoming Avination code needs it.
573 set 575 set
574 { 576 {
575 // There is no offset position when not seated 577 // There is no offset position when not seated
@@ -2751,7 +2753,10 @@ namespace OpenSim.Region.Framework.Scenes
2751 if (IsChildAgent) 2753 if (IsChildAgent)
2752 return; 2754 return;
2753 2755
2754 if (ParentID != 0) 2756 // If we don't have a PhysActor, we can't cross anyway
2757 // Also don't do this while sat, sitting avatars cross with the
2758 // object they sit on.
2759 if (ParentID != 0 || PhysActor == null)
2755 return; 2760 return;
2756 2761
2757 if (!IsInTransit) 2762 if (!IsInTransit)