diff options
| author | Melanie | 2010-08-26 00:11:07 +0100 |
|---|---|---|
| committer | Melanie | 2010-08-26 00:11:07 +0100 |
| commit | fc8d2be632c754338b136fe4a3d57c40b0190ce7 (patch) | |
| tree | 94bb954bdf258e968e8c337ad1da57ba9fa68b91 /OpenSim/Region/CoreModules/Avatar | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-fc8d2be632c754338b136fe4a3d57c40b0190ce7.zip opensim-SC-fc8d2be632c754338b136fe4a3d57c40b0190ce7.tar.gz opensim-SC-fc8d2be632c754338b136fe4a3d57c40b0190ce7.tar.bz2 opensim-SC-fc8d2be632c754338b136fe4a3d57c40b0190ce7.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
This was rather conflicted. Please test linking.
Diffstat (limited to '')
| -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); |