aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-08-13 20:23:53 +0100
committerJustin Clark-Casey (justincc)2010-08-13 20:23:53 +0100
commit39a748b47a5eb8020f167287c84a91bee0881cca (patch)
tree2733d3111fd652549a6447b4c991c3f5e7664986 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
parentFile wants to be committed (diff)
downloadopensim-SC_OLD-39a748b47a5eb8020f167287c84a91bee0881cca.zip
opensim-SC_OLD-39a748b47a5eb8020f167287c84a91bee0881cca.tar.gz
opensim-SC_OLD-39a748b47a5eb8020f167287c84a91bee0881cca.tar.bz2
opensim-SC_OLD-39a748b47a5eb8020f167287c84a91bee0881cca.tar.xz
refactor: Use SOP.Flags rather than SOP.ObjectFlags
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 3670080..117f869 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1322,9 +1322,9 @@ namespace OpenSim.Region.Framework.Scenes
1322 1322
1323 public void aggregateScriptEvents() 1323 public void aggregateScriptEvents()
1324 { 1324 {
1325 uint objectflagupdate=(uint)RootPart.GetEffectiveObjectFlags(); 1325 PrimFlags objectflagupdate = (PrimFlags)RootPart.GetEffectiveObjectFlags();
1326 1326
1327 scriptEvents aggregateScriptEvents=0; 1327 scriptEvents aggregateScriptEvents = 0;
1328 1328
1329 lock (m_parts) 1329 lock (m_parts)
1330 { 1330 {
@@ -1333,7 +1333,7 @@ namespace OpenSim.Region.Framework.Scenes
1333 if (part == null) 1333 if (part == null)
1334 continue; 1334 continue;
1335 if (part != RootPart) 1335 if (part != RootPart)
1336 part.ObjectFlags = objectflagupdate; 1336 part.Flags = objectflagupdate;
1337 aggregateScriptEvents |= part.AggregateScriptEvents; 1337 aggregateScriptEvents |= part.AggregateScriptEvents;
1338 } 1338 }
1339 } 1339 }