Add a few comments, correct a merge artefact
parent
2347593dac
commit
6412349dec
|
@ -570,6 +570,8 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
public Vector3 OffsetPosition
|
public Vector3 OffsetPosition
|
||||||
{
|
{
|
||||||
get { return m_pos; }
|
get { return m_pos; }
|
||||||
|
// Don't remove setter. It's not currently used in core but
|
||||||
|
// upcoming Avination code needs it.
|
||||||
set
|
set
|
||||||
{
|
{
|
||||||
// There is no offset position when not seated
|
// There is no offset position when not seated
|
||||||
|
@ -2751,7 +2753,10 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
if (IsChildAgent)
|
if (IsChildAgent)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (ParentID != 0)
|
// If we don't have a PhysActor, we can't cross anyway
|
||||||
|
// Also don't do this while sat, sitting avatars cross with the
|
||||||
|
// object they sit on.
|
||||||
|
if (ParentID != 0 || PhysActor == null)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (!IsInTransit)
|
if (!IsInTransit)
|
||||||
|
|
Loading…
Reference in New Issue