diff options
| author | Melanie Thielker | 2010-08-14 13:59:36 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2010-08-14 13:59:36 +0200 |
| commit | a32b0ce0ae28ff42d30e25530dc286401188b89c (patch) | |
| tree | da6483e4bb98e3036c8b3b4da5ecad59546611c7 /OpenSim | |
| parent | Log the state of the prejump flag (diff) | |
| download | opensim-SC-a32b0ce0ae28ff42d30e25530dc286401188b89c.zip opensim-SC-a32b0ce0ae28ff42d30e25530dc286401188b89c.tar.gz opensim-SC-a32b0ce0ae28ff42d30e25530dc286401188b89c.tar.bz2 opensim-SC-a32b0ce0ae28ff42d30e25530dc286401188b89c.tar.xz | |
Fix a possible nullref in BestAvatarResponsiveness policy
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Prioritizer.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Prioritizer.cs b/OpenSim/Region/Framework/Scenes/Prioritizer.cs index 8cd0160..7c3746b 100644 --- a/OpenSim/Region/Framework/Scenes/Prioritizer.cs +++ b/OpenSim/Region/Framework/Scenes/Prioritizer.cs | |||
| @@ -186,9 +186,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 186 | return 0.0; | 186 | return 0.0; |
| 187 | 187 | ||
| 188 | // Use group position for child prims | 188 | // Use group position for child prims |
| 189 | Vector3 entityPos = entity.AbsolutePosition; | 189 | Vector3 entityPos; |
| 190 | if (entity is SceneObjectPart) | 190 | if (entity is SceneObjectPart) |
| 191 | entityPos = m_scene.GetGroupByPrim(entity.LocalId).AbsolutePosition; | 191 | entityPos = ((SceneObjectPart)entity).ParentGroup.AbsolutePosition; |
| 192 | else | 192 | else |
| 193 | entityPos = entity.AbsolutePosition; | 193 | entityPos = entity.AbsolutePosition; |
| 194 | 194 | ||