diff options
author | Melanie Thielker | 2008-10-04 01:09:22 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-10-04 01:09:22 +0000 |
commit | 74f89fb22da159a940e942192d0cb59163e78987 (patch) | |
tree | d7fc5ace338e6e07c6b6785a5fb4ee308a08bcec /OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |
parent | Add the missing bits for the new region-search: (diff) | |
download | opensim-SC_OLD-74f89fb22da159a940e942192d0cb59163e78987.zip opensim-SC_OLD-74f89fb22da159a940e942192d0cb59163e78987.tar.gz opensim-SC_OLD-74f89fb22da159a940e942192d0cb59163e78987.tar.bz2 opensim-SC_OLD-74f89fb22da159a940e942192d0cb59163e78987.tar.xz |
Add "Drop" functionality to pie menu
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 6cd0bae..18322ee 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -766,19 +766,19 @@ namespace OpenSim.Region.Environment.Scenes | |||
766 | { | 766 | { |
767 | ScenePresence avatar = m_scene.GetScenePresence(m_rootPart.AttachedAvatar); | 767 | ScenePresence avatar = m_scene.GetScenePresence(m_rootPart.AttachedAvatar); |
768 | Vector3 detachedpos = new Vector3(127f,127f,127f); | 768 | Vector3 detachedpos = new Vector3(127f,127f,127f); |
769 | if (avatar != null) | 769 | if (avatar == null) |
770 | { | 770 | return; |
771 | detachedpos = avatar.AbsolutePosition; | 771 | |
772 | avatar.RemoveAttachment(this); | 772 | detachedpos = avatar.AbsolutePosition; |
773 | } | 773 | |
774 | AbsolutePosition = detachedpos; | 774 | AbsolutePosition = detachedpos; |
775 | m_rootPart.AttachedAvatar = UUID.Zero; | 775 | m_rootPart.AttachedAvatar = UUID.Zero; |
776 | m_rootPart.SetParentLocalId(0); | 776 | m_rootPart.SetParentLocalId(0); |
777 | SetAttachmentPoint((byte)0); | 777 | SetAttachmentPoint((byte)0); |
778 | m_rootPart.IsAttachment = false; | ||
779 | m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_scene.m_physicalPrim); | 778 | m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_scene.m_physicalPrim); |
780 | HasGroupChanged = true; | 779 | HasGroupChanged = true; |
781 | AttachToBackup(); | 780 | AttachToBackup(); |
781 | m_scene.EventManager.TriggerParcelPrimCountTainted(); | ||
782 | m_rootPart.ScheduleFullUpdate(); | 782 | m_rootPart.ScheduleFullUpdate(); |
783 | m_rootPart.ClearUndoState(); | 783 | m_rootPart.ClearUndoState(); |
784 | } | 784 | } |