diff options
| author | Melanie | 2012-08-24 01:22:44 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-24 01:22:44 +0100 |
| commit | 7cdb564fdd1b75f674a572d5484473cc33145891 (patch) | |
| tree | 048c59aafd1faf45ce13a2b7ec9bad0024e1d9f6 /OpenSim/Region/Framework | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-7cdb564fdd1b75f674a572d5484473cc33145891.zip opensim-SC-7cdb564fdd1b75f674a572d5484473cc33145891.tar.gz opensim-SC-7cdb564fdd1b75f674a572d5484473cc33145891.tar.bz2 opensim-SC-7cdb564fdd1b75f674a572d5484473cc33145891.tar.xz | |
Merge branch 'master' 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 1309623..574c9af 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -1986,6 +1986,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1986 | // If child prims have invalid perms, fix them | 1986 | // If child prims have invalid perms, fix them |
| 1987 | grp.AdjustChildPrimPermissions(); | 1987 | grp.AdjustChildPrimPermissions(); |
| 1988 | 1988 | ||
| 1989 | // If child prims have invalid perms, fix them | ||
| 1990 | grp.AdjustChildPrimPermissions(); | ||
| 1991 | |||
| 1989 | if (remoteClient == null) | 1992 | if (remoteClient == null) |
| 1990 | { | 1993 | { |
| 1991 | // Autoreturn has a null client. Nothing else does. So | 1994 | // Autoreturn has a null client. Nothing else does. So |