OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into careminster 

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
avinationmerge
Melanie 2012-05-15 21:19:06 +01:00
parent 71115c32ad ef94c31ef8
commit a36c487c79
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -2567,7 +2567,7 @@ namespace OpenSim.Region.Framework.Scenes
} }
else else
{ {
if ((ParentGroup.RootPart.ScriptEvents & scriptEvents.collision_start) != 0) if ((ParentGroup.RootPart.ScriptEvents & ev) != 0)
sendToRoot = true; sendToRoot = true;
} }
if (sendToRoot && ParentGroup.RootPart != this) if (sendToRoot && ParentGroup.RootPart != this)
@ -4708,6 +4708,9 @@ namespace OpenSim.Region.Framework.Scenes
public void aggregateScriptEvents() public void aggregateScriptEvents()
{ {
if (ParentGroup == null || ParentGroup.RootPart == null)
return;
AggregateScriptEvents = 0; AggregateScriptEvents = 0;
// Aggregate script events // Aggregate script events