diff options
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs index 69ce967..0516cb1 100644 --- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | |||
@@ -65,7 +65,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
65 | /// <param name="AttachmentPt"></param> | 65 | /// <param name="AttachmentPt"></param> |
66 | /// <param name="silent"></param> | 66 | /// <param name="silent"></param> |
67 | /// <returns>true if the object was successfully attached, false otherwise</returns> | 67 | /// <returns>true if the object was successfully attached, false otherwise</returns> |
68 | bool AttachObject(IScenePresence sp, SceneObjectGroup grp, uint AttachmentPt, bool silent); | 68 | bool AttachObject(IScenePresence sp, SceneObjectGroup grp, uint AttachmentPt, bool silent, bool useAttachmentInfo); |
69 | 69 | ||
70 | /// <summary> | 70 | /// <summary> |
71 | /// Rez an attachment from user inventory and change inventory status to match. | 71 | /// Rez an attachment from user inventory and change inventory status to match. |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index a9a4cda..6a120c1 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2692,7 +2692,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2692 | RootPrim.RemFlag(PrimFlags.TemporaryOnRez); | 2692 | RootPrim.RemFlag(PrimFlags.TemporaryOnRez); |
2693 | 2693 | ||
2694 | if (AttachmentsModule != null) | 2694 | if (AttachmentsModule != null) |
2695 | AttachmentsModule.AttachObject(sp, grp, 0, false); | 2695 | AttachmentsModule.AttachObject(sp, grp, 0, false, false); |
2696 | } | 2696 | } |
2697 | else | 2697 | else |
2698 | { | 2698 | { |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index a57e9bc..5694c8c 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -2634,7 +2634,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2634 | colliding.Add(CreateDetObjectForGround()); | 2634 | colliding.Add(CreateDetObjectForGround()); |
2635 | LandCollidingMessage.Colliders = colliding; | 2635 | LandCollidingMessage.Colliders = colliding; |
2636 | 2636 | ||
2637 | notify(LocalId, LandCollidingMessage); | 2637 | notify(ParentGroup.RootPart.LocalId, LandCollidingMessage); |
2638 | } | 2638 | } |
2639 | } | 2639 | } |
2640 | 2640 | ||