OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into careminster

avinationmerge
Melanie 2011-12-22 16:52:14 +00:00
parent c63d5f8e0c 6412349dec
commit 66a0471efa
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -574,6 +574,8 @@ namespace OpenSim.Region.Framework.Scenes
public Vector3 OffsetPosition
{
get { return m_pos; }
// Don't remove setter. It's not currently used in core but
// upcoming Avination code needs it.
set
{
// There is no offset position when not seated
@ -2762,7 +2764,10 @@ namespace OpenSim.Region.Framework.Scenes
if (IsChildAgent)
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;
if (!IsInTransit)