Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2011-02-27 19:47:37 +00:00
5 changed files with 11 additions and 19 deletions

View File

@@ -218,9 +218,10 @@ namespace OpenSim.Region.Framework.Scenes
for (int i = 0; i < Math.Min(presences.Count, maxLocations); ++i)
{
ScenePresence sp = presences[i];
// If this presence is a child agent, we don't want its coarse locations
if (sp.IsChildAgent)
return;
continue;
if (sp.ParentID != 0)
{