diff options
| author | Justin Clark-Casey (justincc) | 2012-06-14 01:12:16 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-06-14 01:20:55 +0100 |
| commit | a4290048e5333d34910fd8c4dfd6cb9b5819d1c1 (patch) | |
| tree | 2615edb0a04edff9f3d412f0f0b7b4a3b676537e /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
| parent | minor: remove unnecessary IsAttachment = false setting for new object in Uplo... (diff) | |
| download | opensim-SC-a4290048e5333d34910fd8c4dfd6cb9b5819d1c1.zip opensim-SC-a4290048e5333d34910fd8c4dfd6cb9b5819d1c1.tar.gz opensim-SC-a4290048e5333d34910fd8c4dfd6cb9b5819d1c1.tar.bz2 opensim-SC-a4290048e5333d34910fd8c4dfd6cb9b5819d1c1.tar.xz | |
Add SOG.HasPrivateAttachmentPoint to tell if a SOG has a private attachment point. HUDs attachment points are private.
Change SOP.SendFullUpdateToClient() and SoundModule.PlayAttachedSound() to use this rather than different magic number formulations.
This also corrects a bug in PlayAttachedSound() where the code assumed that all attachment points over 30 were HUDs.
It appears this is no longer true with Neck and Root (Avatar Center)
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 17c7661..7640fc0 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -2573,8 +2573,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2573 | if (ParentGroup.IsDeleted) | 2573 | if (ParentGroup.IsDeleted) |
| 2574 | return; | 2574 | return; |
| 2575 | 2575 | ||
| 2576 | if (ParentGroup.IsAttachment && (ParentGroup.AttachedAvatar != remoteClient.AgentId) && | 2576 | if (ParentGroup.IsAttachment |
| 2577 | (ParentGroup.AttachmentPoint >= 31) && (ParentGroup.AttachmentPoint <= 38)) | 2577 | && ParentGroup.AttachedAvatar != remoteClient.AgentId |
| 2578 | && ParentGroup.HasPrivateAttachmentPoint) | ||
| 2578 | return; | 2579 | return; |
| 2579 | 2580 | ||
| 2580 | if (remoteClient.AgentId == OwnerID) | 2581 | if (remoteClient.AgentId == OwnerID) |