Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim

This commit is contained in:
Justin Clark-Casey (justincc)
2010-03-12 22:49:16 +00:00
18 changed files with 6198 additions and 5998 deletions

View File

@@ -2044,6 +2044,7 @@ namespace OpenSim.Region.Framework.Scenes
{
m_lastColliders.Remove(localID);
}
if (m_parentGroup == null)
return;
if (m_parentGroup.IsDeleted)