ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 18:25:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
This commit is contained in:
Melanie
2012-05-15 21:19:06 +01:00
parent 71115c32ad ef94c31ef8
commit a36c487c79
1 changed files with 4 additions and 1 deletions
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
{
if ((ParentGroup.RootPart.ScriptEvents & scriptEvents.collision_start) != 0)
if ((ParentGroup.RootPart.ScriptEvents & ev) != 0)
sendToRoot = true;
}
if (sendToRoot && ParentGroup.RootPart != this)
@@ -4708,6 +4708,9 @@ namespace OpenSim.Region.Framework.Scenes
public void aggregateScriptEvents()
{
if (ParentGroup == null || ParentGroup.RootPart == null)
return;
AggregateScriptEvents = 0;
// Aggregate script events