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

Prevent a nullref when nonphysical motion objects cross sim boundaries

avinationmerge
Melanie 2012-02-23 23:18:01 +01:00
parent 7c520cf531
commit e74bf46007
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

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