diff options
Merge branch 'master' into careminster-presence-refactor
This was rather conflicted. Please test linking.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index c802490..74784ae 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -427,7 +427,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
427 | if (m_scene.TryGetScenePresence(remoteClient.AgentId, out presence)) | 427 | if (m_scene.TryGetScenePresence(remoteClient.AgentId, out presence)) |
428 | { | 428 | { |
429 | if (!m_scene.Permissions.CanRezObject( | 429 | if (!m_scene.Permissions.CanRezObject( |
430 | part.ParentGroup.Children.Count, remoteClient.AgentId, presence.AbsolutePosition)) | 430 | part.ParentGroup.PrimCount, remoteClient.AgentId, presence.AbsolutePosition)) |
431 | return; | 431 | return; |
432 | 432 | ||
433 | presence.Appearance.DetachAttachment(itemID); | 433 | presence.Appearance.DetachAttachment(itemID); |