aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-03-09 02:50:57 +0000
committerJustin Clark-Casey (justincc)2012-03-09 02:50:57 +0000
commit06dda14505743bde237362b0e469d16548922f33 (patch)
tree0cab738927e0eb65fe8fea9ccd736a6d9329e432
parentGet rid of unnecessary ParentID == 0 check on SP.Get_AbsolutePosition since t... (diff)
downloadopensim-SC_OLD-06dda14505743bde237362b0e469d16548922f33.zip
opensim-SC_OLD-06dda14505743bde237362b0e469d16548922f33.tar.gz
opensim-SC_OLD-06dda14505743bde237362b0e469d16548922f33.tar.bz2
opensim-SC_OLD-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.
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs6
-rw-r--r--OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs9
2 files changed, 3 insertions, 12 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index dd0ca43..bc3400a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -215,11 +215,7 @@ namespace OpenSim.Region.Framework.Scenes
215 if (sp.IsChildAgent) 215 if (sp.IsChildAgent)
216 continue; 216 continue;
217 217
218 SceneObjectPart sitPart = sp.ParentPart; 218 coarseLocations.Add(sp.AbsolutePosition);
219 if (sitPart != null)
220 coarseLocations.Add(sitPart.AbsolutePosition + sp.OffsetPosition);
221 else
222 coarseLocations.Add(sp.AbsolutePosition);
223 219
224 avatarUUIDs.Add(sp.UUID); 220 avatarUUIDs.Add(sp.UUID);
225 } 221 }
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 });