diff options
| author | Melanie | 2012-02-23 23:18:01 +0100 |
|---|---|---|
| committer | Melanie | 2012-02-23 23:18:01 +0100 |
| commit | e74bf4600759c3fee6aa62ee808bbf214c019b6d (patch) | |
| tree | 5563d88e40cf2b0aded2c5f0ba44c46ff301d3cb /OpenSim/Region/Framework/Scenes | |
| parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff) | |
| download | opensim-SC_OLD-e74bf4600759c3fee6aa62ee808bbf214c019b6d.zip opensim-SC_OLD-e74bf4600759c3fee6aa62ee808bbf214c019b6d.tar.gz opensim-SC_OLD-e74bf4600759c3fee6aa62ee808bbf214c019b6d.tar.bz2 opensim-SC_OLD-e74bf4600759c3fee6aa62ee808bbf214c019b6d.tar.xz | |
Prevent a nullref when nonphysical motion objects cross sim boundaries
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index cf8637f..248d4c6 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -582,7 +582,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 582 | foreach (ScenePresence av in m_linkedAvatars) | 582 | foreach (ScenePresence av in m_linkedAvatars) |
| 583 | { | 583 | { |
| 584 | SceneObjectPart p = m_scene.GetSceneObjectPart(av.ParentID); | 584 | SceneObjectPart p = m_scene.GetSceneObjectPart(av.ParentID); |
| 585 | if (m_parts.TryGetValue(p.UUID, out p)) | 585 | if (p != null && m_parts.TryGetValue(p.UUID, out p)) |
| 586 | { | 586 | { |
| 587 | Vector3 offset = p.GetWorldPosition() - av.ParentPosition; | 587 | Vector3 offset = p.GetWorldPosition() - av.ParentPosition; |
| 588 | av.AbsolutePosition += offset; | 588 | av.AbsolutePosition += offset; |