diff options
| author | meta7 | 2010-08-18 02:53:27 -0700 |
|---|---|---|
| committer | meta7 | 2010-08-18 02:53:27 -0700 |
| commit | ca8b1e488c167e5644567cb001c9c2a6504f15f7 (patch) | |
| tree | 2a99b396dd4ccbd6c801efc0890fad1bd94b45e2 /OpenSim/Region/Framework/Scenes/Prioritizer.cs | |
| parent | Fix a nullref exception in the prioritizer (diff) | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.zip opensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.tar.gz opensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.tar.bz2 opensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Prioritizer.cs')
| -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 c6db7af..145f9ed 100644 --- a/OpenSim/Region/Framework/Scenes/Prioritizer.cs +++ b/OpenSim/Region/Framework/Scenes/Prioritizer.cs | |||
| @@ -197,9 +197,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 197 | return 0.0; | 197 | return 0.0; |
| 198 | 198 | ||
| 199 | // Use group position for child prims | 199 | // Use group position for child prims |
| 200 | Vector3 entityPos = entity.AbsolutePosition; | 200 | Vector3 entityPos; |
| 201 | if (entity is SceneObjectPart) | 201 | if (entity is SceneObjectPart) |
| 202 | entityPos = m_scene.GetGroupByPrim(entity.LocalId).AbsolutePosition; | 202 | entityPos = ((SceneObjectPart)entity).ParentGroup.AbsolutePosition; |
| 203 | else | 203 | else |
| 204 | entityPos = entity.AbsolutePosition; | 204 | entityPos = entity.AbsolutePosition; |
| 205 | 205 | ||