ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 08:06:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use SP.ParentPart instead of ParentID in places where it's more efficient (saving extra null checks, etc.)

Browse Source 
However, it looks like we should retain SP.ParentID since it's much easier to use that in places where another thread could change ParentPart to null.
Otherwise one has to clumsily put ParentPart in a reference, etc. to avoid a race.
This commit is contained in:
Justin Clark-Casey (justincc)
2012-03-09 02:38:11 +00:00
parent b454326273
commit 94e58ff6b9
4 changed files with 32 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -716,29 +716,17 @@ namespace OpenSim.Region.RegionCombinerModule
{
if (sp.UUID != presence.UUID)
{
if (sp.ParentID != 0)
{
// sitting avatar
SceneObjectPart sop = connectiondata.RegionScene.GetSceneObjectPart(sp.ParentID);
if (sop != null)
{
CoarseLocations.Add(sop.AbsolutePosition + sp.AbsolutePosition);
AvatarUUIDs.Add(sp.UUID);
}
else
{
// we can't find the parent.. ! arg!
CoarseLocations.Add(sp.AbsolutePosition);
AvatarUUIDs.Add(sp.UUID);
}
}
SceneObjectPart sitPart = sp.ParentPart;
if (sitPart != null)
CoarseLocations.Add(sitPart.AbsolutePosition + sp.AbsolutePosition);
else
{
CoarseLocations.Add(sp.AbsolutePosition);
AvatarUUIDs.Add(sp.UUID);
}
AvatarUUIDs.Add(sp.UUID);
}
});
DistributeCourseLocationUpdates(CoarseLocations, AvatarUUIDs, connectiondata, presence);
}