diff options
author | Justin Clark-Casey (justincc) | 2012-03-09 02:50:57 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-03-09 02:50:57 +0000 |
commit | 06dda14505743bde237362b0e469d16548922f33 (patch) | |
tree | 0cab738927e0eb65fe8fea9ccd736a6d9329e432 /OpenSim/Region/RegionCombinerModule | |
parent | Get rid of unnecessary ParentID == 0 check on SP.Get_AbsolutePosition since t... (diff) | |
download | opensim-SC-06dda14505743bde237362b0e469d16548922f33.zip opensim-SC-06dda14505743bde237362b0e469d16548922f33.tar.gz opensim-SC-06dda14505743bde237362b0e469d16548922f33.tar.bz2 opensim-SC-06dda14505743bde237362b0e469d16548922f33.tar.xz |
Simplify minimap coarse location code by just reference SP.AbsolutePosition
This is rather than checking whether the avatar is sitting and doing its own calculation.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs index a2e3ac2..eb633b3 100644 --- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs +++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | |||
@@ -712,17 +712,12 @@ namespace OpenSim.Region.RegionCombinerModule | |||
712 | 712 | ||
713 | List<Vector3> CoarseLocations = new List<Vector3>(); | 713 | List<Vector3> CoarseLocations = new List<Vector3>(); |
714 | List<UUID> AvatarUUIDs = new List<UUID>(); | 714 | List<UUID> AvatarUUIDs = new List<UUID>(); |
715 | |||
715 | connectiondata.RegionScene.ForEachRootScenePresence(delegate(ScenePresence sp) | 716 | connectiondata.RegionScene.ForEachRootScenePresence(delegate(ScenePresence sp) |
716 | { | 717 | { |
717 | if (sp.UUID != presence.UUID) | 718 | if (sp.UUID != presence.UUID) |
718 | { | 719 | { |
719 | SceneObjectPart sitPart = sp.ParentPart; | 720 | CoarseLocations.Add(sp.AbsolutePosition); |
720 | |||
721 | if (sitPart != null) | ||
722 | CoarseLocations.Add(sitPart.AbsolutePosition + sp.AbsolutePosition); | ||
723 | else | ||
724 | CoarseLocations.Add(sp.AbsolutePosition); | ||
725 | |||
726 | AvatarUUIDs.Add(sp.UUID); | 721 | AvatarUUIDs.Add(sp.UUID); |
727 | } | 722 | } |
728 | }); | 723 | }); |