diff options
| author | Melanie Thielker | 2010-06-14 00:12:39 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2010-06-14 00:12:39 +0200 |
| commit | 1532dbca0ae54ee6427153d7beec95b8cb52e1e3 (patch) | |
| tree | 0927c43b6e8ebf5db39ec7fb2794f9f88dca2bdd /OpenSim/Region/Framework | |
| parent | Revert "Introduce SOP.UpdateSitters() to update sitting avatars' chat positio... (diff) | |
| download | opensim-SC_OLD-1532dbca0ae54ee6427153d7beec95b8cb52e1e3.zip opensim-SC_OLD-1532dbca0ae54ee6427153d7beec95b8cb52e1e3.tar.gz opensim-SC_OLD-1532dbca0ae54ee6427153d7beec95b8cb52e1e3.tar.bz2 opensim-SC_OLD-1532dbca0ae54ee6427153d7beec95b8cb52e1e3.tar.xz | |
Guard against a potential nullref
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 7a7816a..9c507c2 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -470,7 +470,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 470 | if (m_parentID == 0) | 470 | if (m_parentID == 0) |
| 471 | { | 471 | { |
| 472 | SceneObjectPart part = m_scene.GetSceneObjectPart(m_parentID); | 472 | SceneObjectPart part = m_scene.GetSceneObjectPart(m_parentID); |
| 473 | m_parentPosition = part.AbsolutePosition; | 473 | if (part != null) |
| 474 | m_parentPosition = part.AbsolutePosition; | ||
| 474 | } | 475 | } |
| 475 | 476 | ||
| 476 | return m_parentPosition + m_pos; | 477 | return m_parentPosition + m_pos; |