diff options
author | Melanie Thielker | 2016-04-29 17:11:36 +0200 |
---|---|---|
committer | Melanie Thielker | 2016-04-29 17:11:36 +0200 |
commit | bedebf94984dc577c5e2f51c6273704f6e77741c (patch) | |
tree | 0f87205b3f39343fcf6575e1042e454dd552fdcf /OpenSim/Region/Framework/Scenes | |
parent | Fix incorrect SQLite syntax in Migrations (diff) | |
download | opensim-SC-bedebf94984dc577c5e2f51c6273704f6e77741c.zip opensim-SC-bedebf94984dc577c5e2f51c6273704f6e77741c.tar.gz opensim-SC-bedebf94984dc577c5e2f51c6273704f6e77741c.tar.bz2 opensim-SC-bedebf94984dc577c5e2f51c6273704f6e77741c.tar.xz |
Prevent "Object->Take" from working on attachments.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index edb881f..1910a78 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -2144,8 +2144,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2144 | 2144 | ||
2145 | foreach (uint localID in localIDs) | 2145 | foreach (uint localID in localIDs) |
2146 | { | 2146 | { |
2147 | |||
2148 | |||
2149 | // Invalid id | 2147 | // Invalid id |
2150 | SceneObjectPart part = GetSceneObjectPart(localID); | 2148 | SceneObjectPart part = GetSceneObjectPart(localID); |
2151 | if (part == null) | 2149 | if (part == null) |
@@ -2168,6 +2166,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2168 | continue; | 2166 | continue; |
2169 | 2167 | ||
2170 | SceneObjectGroup grp = part.ParentGroup; | 2168 | SceneObjectGroup grp = part.ParentGroup; |
2169 | if (grp.IsAttachment) | ||
2170 | continue; | ||
2171 | 2171 | ||
2172 | // If child prims have invalid perms, fix them | 2172 | // If child prims have invalid perms, fix them |
2173 | grp.AdjustChildPrimPermissions(false); | 2173 | grp.AdjustChildPrimPermissions(false); |