diff options
| author | Melanie | 2010-12-12 01:20:46 +0000 |
|---|---|---|
| committer | Melanie | 2010-12-12 01:20:46 +0000 |
| commit | 8aa63093b118f257eff87c003e668249c34f5162 (patch) | |
| tree | a5ea5448482d899729c29079ed0dab8394bb9be4 /OpenSim/Region/Framework/Scenes/SceneGraph.cs | |
| parent | Fix border fence for physicals. Fix llRotLookAt() for Vehicles. (diff) | |
| parent | Revert "Another stab at mantis #5256" (diff) | |
| download | opensim-SC_OLD-8aa63093b118f257eff87c003e668249c34f5162.zip opensim-SC_OLD-8aa63093b118f257eff87c003e668249c34f5162.tar.gz opensim-SC_OLD-8aa63093b118f257eff87c003e668249c34f5162.tar.bz2 opensim-SC_OLD-8aa63093b118f257eff87c003e668249c34f5162.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index ecc7f40..7eebb99 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
| @@ -223,8 +223,27 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 223 | if (sp.IsChildAgent) | 223 | if (sp.IsChildAgent) |
| 224 | return; | 224 | return; |
| 225 | 225 | ||
| 226 | coarseLocations.Add(sp.AbsolutePosition); | 226 | if (sp.ParentID != 0) |
| 227 | avatarUUIDs.Add(sp.UUID); | 227 | { |
| 228 | // sitting avatar | ||
| 229 | SceneObjectPart sop = m_parentScene.GetSceneObjectPart(sp.ParentID); | ||
| 230 | if (sop != null) | ||
| 231 | { | ||
| 232 | coarseLocations.Add(sop.AbsolutePosition + sp.OffsetPosition); | ||
| 233 | avatarUUIDs.Add(sp.UUID); | ||
| 234 | } | ||
| 235 | else | ||
| 236 | { | ||
| 237 | // we can't find the parent.. ! arg! | ||
| 238 | coarseLocations.Add(sp.AbsolutePosition); | ||
| 239 | avatarUUIDs.Add(sp.UUID); | ||
| 240 | } | ||
| 241 | } | ||
| 242 | else | ||
| 243 | { | ||
| 244 | coarseLocations.Add(sp.AbsolutePosition); | ||
| 245 | avatarUUIDs.Add(sp.UUID); | ||
| 246 | } | ||
| 228 | } | 247 | } |
| 229 | } | 248 | } |
| 230 | 249 | ||