Merge branch 'master' of /home/opensim/var/repo/opensim

integration
BlueWall 2012-05-14 22:39:03 -04:00
commit e9d1af46fa
1 changed files with 1 additions and 1 deletions

View File

@ -4285,7 +4285,7 @@ namespace OpenSim.Region.Framework.Scenes
public void aggregateScriptEvents() public void aggregateScriptEvents()
{ {
if (ParentGroup.RootPart == null) if (ParentGroup == null || ParentGroup.RootPart == null)
return; return;
AggregateScriptEvents = 0; AggregateScriptEvents = 0;