ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +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/SceneObjectGroup.cs
View File

@@ -493,8 +493,8 @@ namespace OpenSim.Region.Framework.Scenes
{
foreach (ScenePresence av in m_linkedAvatars)
{
SceneObjectPart p;
if (m_parts.TryGetValue(av.LinkedPrim, out p))
SceneObjectPart p = m_scene.GetSceneObjectPart(av.ParentID);
if (m_parts.TryGetValue(p.UUID, out p))
{
Vector3 offset = p.GetWorldPosition() - av.ParentPosition;
av.AbsolutePosition += offset;