diff options
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | 3 | ||||
-rwxr-xr-x | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs index 3c1247f..b008068 100644 --- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | |||
@@ -90,7 +90,8 @@ namespace OpenSim.Region.Framework.Interfaces | |||
90 | /// <param name="addToInventory">If true then add object to user inventory</param> | 90 | /// <param name="addToInventory">If true then add object to user inventory</param> |
91 | /// <param name="append">Append to attachment point rather than replace.</param> | 91 | /// <param name="append">Append to attachment point rather than replace.</param> |
92 | /// <returns>true if the object was successfully attached, false otherwise</returns> | 92 | /// <returns>true if the object was successfully attached, false otherwise</returns> |
93 | bool AttachObject(IScenePresence sp, SceneObjectGroup grp, uint AttachmentPt, bool silent, bool useAttachmentInfo, bool addToInventory, bool append); | 93 | bool AttachObject(IScenePresence sp, SceneObjectGroup grp, uint AttachmentPt, bool silent, |
94 | bool addToInventory, bool append); | ||
94 | 95 | ||
95 | /// <summary> | 96 | /// <summary> |
96 | /// Rez an attachment from user inventory and change inventory status to match. | 97 | /// 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 2a917a9..837a994 100755 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -3035,7 +3035,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3035 | // information that this is due to a teleport/border cross rather than an ordinary attachment. | 3035 | // information that this is due to a teleport/border cross rather than an ordinary attachment. |
3036 | // We currently do this in Scene.MakeRootAgent() instead. | 3036 | // We currently do this in Scene.MakeRootAgent() instead. |
3037 | if (AttachmentsModule != null) | 3037 | if (AttachmentsModule != null) |
3038 | AttachmentsModule.AttachObject(sp, grp, 0, false, false, false, true); | 3038 | AttachmentsModule.AttachObject(sp, grp, 0, false, false, true); |
3039 | } | 3039 | } |
3040 | else | 3040 | else |
3041 | { | 3041 | { |