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

Merge branch 'master' into careminster-presence-refactor

Browse Source
This commit is contained in:
Melanie
2010-08-18 00:59:20 +01:00
parent f2d7f3e731 a8c0b131f9
commit e74809ff4c
66 changed files with 1121 additions and 595 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@@ -1588,9 +1588,9 @@ namespace OpenSim.Region.Framework.Scenes
public void aggregateScriptEvents()
{
uint objectflagupdate=(uint)RootPart.GetEffectiveObjectFlags();
PrimFlags objectflagupdate = (PrimFlags)RootPart.GetEffectiveObjectFlags();
scriptEvents aggregateScriptEvents=0;
scriptEvents aggregateScriptEvents = 0;
lockPartsForRead(true);
{
@@ -1600,7 +1600,7 @@ namespace OpenSim.Region.Framework.Scenes
if (part == null)
continue;
if (part != RootPart)
part.ObjectFlags = objectflagupdate;
part.Flags = objectflagupdate;
aggregateScriptEvents |= part.AggregateScriptEvents;
}