Merge branch 'master' into careminster-presence-refactor

1 files changed, 3 insertions, 3 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 20a2abc..9b66fad 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -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;
                     
                 }