diff options
| author | Diva Canto | 2017-05-04 18:20:48 -0700 |
|---|---|---|
| committer | Diva Canto | 2017-05-04 18:20:48 -0700 |
| commit | 424a7a274b66bb06c9a3711ee9de267231b89b71 (patch) | |
| tree | 02c1054d7457cd45cd3d62d677affe8f5f209998 /OpenSim/Region/Framework/Scenes/SceneGraph.cs | |
| parent | Add a groups module to the perms test suite (diff) | |
| parent | fix bad move on xmlgroups (diff) | |
| download | opensim-SC_OLD-424a7a274b66bb06c9a3711ee9de267231b89b71.zip opensim-SC_OLD-424a7a274b66bb06c9a3711ee9de267231b89b71.tar.gz opensim-SC_OLD-424a7a274b66bb06c9a3711ee9de267231b89b71.tar.bz2 opensim-SC_OLD-424a7a274b66bb06c9a3711ee9de267231b89b71.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
| -rwxr-xr-x | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index a005068..117d92d 100755 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
| @@ -343,7 +343,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 343 | sceneObject.ForceInventoryPersistence(); | 343 | sceneObject.ForceInventoryPersistence(); |
| 344 | sceneObject.HasGroupChanged = true; | 344 | sceneObject.HasGroupChanged = true; |
| 345 | } | 345 | } |
| 346 | sceneObject.AggregateDeepPerms(); | 346 | sceneObject.InvalidateDeepEffectivePerms(); |
| 347 | return ret; | 347 | return ret; |
| 348 | } | 348 | } |
| 349 | 349 | ||
| @@ -2094,7 +2094,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2094 | child.TriggerScriptChangedEvent(Changed.OWNER); | 2094 | child.TriggerScriptChangedEvent(Changed.OWNER); |
| 2095 | child.ApplyNextOwnerPermissions(); | 2095 | child.ApplyNextOwnerPermissions(); |
| 2096 | } | 2096 | } |
| 2097 | copy.AggregatePerms(); | 2097 | copy.InvalidateEffectivePerms(); |
| 2098 | } | 2098 | } |
| 2099 | } | 2099 | } |
| 2100 | 2100 | ||