diff options
| author | Melanie | 2012-08-24 00:07:56 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-24 00:07:56 +0100 |
| commit | 7fca69222b76684c50db42f3ec268ea073122a87 (patch) | |
| tree | 3510af7d29996bd244b74ffa89ec3205c41b4077 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix bad child prim permissions that can make objects change perms after rezzing (diff) | |
| download | opensim-SC-7fca69222b76684c50db42f3ec268ea073122a87.zip opensim-SC-7fca69222b76684c50db42f3ec268ea073122a87.tar.gz opensim-SC-7fca69222b76684c50db42f3ec268ea073122a87.tar.bz2 opensim-SC-7fca69222b76684c50db42f3ec268ea073122a87.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index f8c0431..1309623 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -1983,6 +1983,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1983 | 1983 | ||
| 1984 | SceneObjectGroup grp = part.ParentGroup; | 1984 | SceneObjectGroup grp = part.ParentGroup; |
| 1985 | 1985 | ||
| 1986 | // If child prims have invalid perms, fix them | ||
| 1987 | grp.AdjustChildPrimPermissions(); | ||
| 1988 | |||
| 1986 | if (remoteClient == null) | 1989 | if (remoteClient == null) |
| 1987 | { | 1990 | { |
| 1988 | // Autoreturn has a null client. Nothing else does. So | 1991 | // Autoreturn has a null client. Nothing else does. So |