ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 08:06:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmerge

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
This commit is contained in:
Melanie
2011-10-25 02:26:56 +01:00
parent 4215aea036 0c041ce12f
commit e2de57ca29
11 changed files with 74 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@@ -776,7 +776,7 @@ namespace OpenSim.Region.Framework.Scenes
List<ScenePresence> avs = ParentGroup.GetLinkedAvatars();
foreach (ScenePresence av in avs)
{
if (av.LinkedPrim == m_uuid)
if (av.ParentID == m_localId)
{
Vector3 offset = (m_offsetPosition - oldpos);
av.AbsolutePosition += offset;
@@ -1260,14 +1260,12 @@ namespace OpenSim.Region.Framework.Scenes
set { m_occupied = value; }
}
public UUID SitTargetAvatar
{
get { return m_sitTargetAvatar; }
set { m_sitTargetAvatar = value; }
}
public virtual UUID RegionID
{
get