OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
0.7.4.1
Justin Clark-Casey (justincc) 2012-03-09 02:50:57 +00:00
parent 205c36d3a4
commit 06dda14505
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/Framework/Scenes/SceneGraph.cs
View File

@ -215,11 +215,7 @@ namespace OpenSim.Region.Framework.Scenes
if (sp.IsChildAgent) if (sp.IsChildAgent)
continue; continue;
SceneObjectPart sitPart = sp.ParentPart; coarseLocations.Add(sp.AbsolutePosition);
if (sitPart != null)
coarseLocations.Add(sitPart.AbsolutePosition + sp.OffsetPosition);
else
coarseLocations.Add(sp.AbsolutePosition);
avatarUUIDs.Add(sp.UUID); avatarUUIDs.Add(sp.UUID);
} }

9
OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
View File

@ -712,17 +712,12 @@ namespace OpenSim.Region.RegionCombinerModule
List<Vector3> CoarseLocations = new List<Vector3>(); List<Vector3> CoarseLocations = new List<Vector3>();
List<UUID> AvatarUUIDs = new List<UUID>(); List<UUID> AvatarUUIDs = new List<UUID>();
connectiondata.RegionScene.ForEachRootScenePresence(delegate(ScenePresence sp) connectiondata.RegionScene.ForEachRootScenePresence(delegate(ScenePresence sp)
{ {
if (sp.UUID != presence.UUID) if (sp.UUID != presence.UUID)
{ {
SceneObjectPart sitPart = sp.ParentPart; CoarseLocations.Add(sp.AbsolutePosition);
if (sitPart != null)
CoarseLocations.Add(sitPart.AbsolutePosition + sp.AbsolutePosition);
else
CoarseLocations.Add(sp.AbsolutePosition);
AvatarUUIDs.Add(sp.UUID); AvatarUUIDs.Add(sp.UUID);
} }
}); });