Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-03-15 17:23:35 +00:00
89 changed files with 13161 additions and 3963 deletions

View File

@@ -2060,6 +2060,7 @@ namespace OpenSim.Region.Framework.Scenes
{
m_lastColliders.Remove(localID);
}
if (m_parentGroup == null)
return;
if (m_parentGroup.IsDeleted)
@@ -2855,7 +2856,7 @@ namespace OpenSim.Region.Framework.Scenes
{
SendFullUpdateToClient(remoteClient, clientFlags);
}
}
}
/// <summary>
/// Send a full update for this part to all clients.