diff options
author | Melanie | 2010-09-03 03:37:18 +0100 |
---|---|---|
committer | Melanie | 2010-09-03 03:37:18 +0100 |
commit | 4e0d6e8e41cf25a8e8d8524d9d5e94ab0752fb00 (patch) | |
tree | 6ecae46c7c5d46d4eb5a5ed65c1a7a8b8b15cc04 /OpenSim/Region/Framework | |
parent | Fix an issue with rezzing scripted objects. (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-4e0d6e8e41cf25a8e8d8524d9d5e94ab0752fb00.zip opensim-SC-4e0d6e8e41cf25a8e8d8524d9d5e94ab0752fb00.tar.gz opensim-SC-4e0d6e8e41cf25a8e8d8524d9d5e94ab0752fb00.tar.bz2 opensim-SC-4e0d6e8e41cf25a8e8d8524d9d5e94ab0752fb00.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 2ed00a0..6e3afa9 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -3911,6 +3911,27 @@ if (m_animator.m_jumping) force.Z = m_animator.m_jumpVelocity; // add for ju | |||
3911 | m_attachments.Add(gobj); | 3911 | m_attachments.Add(gobj); |
3912 | } | 3912 | } |
3913 | } | 3913 | } |
3914 | |||
3915 | /// <summary> | ||
3916 | /// Get the scene object attached to the given point. | ||
3917 | /// </summary> | ||
3918 | /// <param name="attachmentPoint"></param> | ||
3919 | /// <returns>Returns an empty list if there were no attachments at the point.</returns> | ||
3920 | public List<SceneObjectGroup> GetAttachments(uint attachmentPoint) | ||
3921 | { | ||
3922 | List<SceneObjectGroup> attachments = new List<SceneObjectGroup>(); | ||
3923 | |||
3924 | lock (m_attachments) | ||
3925 | { | ||
3926 | foreach (SceneObjectGroup so in m_attachments) | ||
3927 | { | ||
3928 | if (attachmentPoint == so.RootPart.AttachmentPoint) | ||
3929 | attachments.Add(so); | ||
3930 | } | ||
3931 | } | ||
3932 | |||
3933 | return attachments; | ||
3934 | } | ||
3914 | 3935 | ||
3915 | public bool HasAttachments() | 3936 | public bool HasAttachments() |
3916 | { | 3937 | { |