diff options
| author | Melanie | 2010-09-30 16:01:45 +0100 |
|---|---|---|
| committer | Melanie | 2010-09-30 16:01:45 +0100 |
| commit | 521e2c83558d77c0482bebb6764a22c1fb8c5fd9 (patch) | |
| tree | b58fdcab0d9ac8c9056413f005144384da1686a3 /OpenSim/Region/CoreModules/Avatar | |
| parent | Fix an inventory fetch issue (diff) | |
| parent | Prevent dropping someone else's attachments (diff) | |
| download | opensim-SC-521e2c83558d77c0482bebb6764a22c1fb8c5fd9.zip opensim-SC-521e2c83558d77c0482bebb6764a22c1fb8c5fd9.tar.gz opensim-SC-521e2c83558d77c0482bebb6764a22c1fb8c5fd9.tar.bz2 opensim-SC-521e2c83558d77c0482bebb6764a22c1fb8c5fd9.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 6f7256e..9807ea5 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
| @@ -426,6 +426,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
| 426 | if (part == null || part.ParentGroup == null) | 426 | if (part == null || part.ParentGroup == null) |
| 427 | return; | 427 | return; |
| 428 | 428 | ||
| 429 | if (part.ParentGroup.RootPart.AttachedAvatar != remoteClient.AgentId) | ||
| 430 | return; | ||
| 431 | |||
| 429 | UUID inventoryID = part.ParentGroup.GetFromItemID(); | 432 | UUID inventoryID = part.ParentGroup.GetFromItemID(); |
| 430 | 433 | ||
| 431 | ScenePresence presence; | 434 | ScenePresence presence; |