diff options
author | Melanie | 2013-03-05 12:02:22 +0100 |
---|---|---|
committer | Melanie | 2013-03-05 12:02:22 +0100 |
commit | 797bfbfcfaf5485db755ad6a5b19a064210505fd (patch) | |
tree | b17c5faf5fdcc27cbc24150c47c244697337daaa /OpenSim/Region/Framework | |
parent | Add support for void return type (diff) | |
download | opensim-SC_OLD-797bfbfcfaf5485db755ad6a5b19a064210505fd.zip opensim-SC_OLD-797bfbfcfaf5485db755ad6a5b19a064210505fd.tar.gz opensim-SC_OLD-797bfbfcfaf5485db755ad6a5b19a064210505fd.tar.bz2 opensim-SC_OLD-797bfbfcfaf5485db755ad6a5b19a064210505fd.tar.xz |
Multiattach, part 1
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 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs index d781eae..eaaf7a3 100644 --- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | |||
@@ -84,7 +84,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
84 | /// <param name="AttachmentPt"></param> | 84 | /// <param name="AttachmentPt"></param> |
85 | /// <param name="silent"></param> | 85 | /// <param name="silent"></param> |
86 | /// <returns>true if the object was successfully attached, false otherwise</returns> | 86 | /// <returns>true if the object was successfully attached, false otherwise</returns> |
87 | bool AttachObject(IScenePresence sp, SceneObjectGroup grp, uint AttachmentPt, bool silent, bool useAttachmentInfo, bool temp); | 87 | bool AttachObject(IScenePresence sp, SceneObjectGroup grp, uint AttachmentPt, bool silent, bool useAttachmentInfo, bool temp, bool append); |
88 | 88 | ||
89 | /// <summary> | 89 | /// <summary> |
90 | /// Rez an attachment from user inventory and change inventory status to match. | 90 | /// 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 05d5ccd..2e64819 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2866,7 +2866,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2866 | RootPrim.RemFlag(PrimFlags.TemporaryOnRez); | 2866 | RootPrim.RemFlag(PrimFlags.TemporaryOnRez); |
2867 | 2867 | ||
2868 | if (AttachmentsModule != null) | 2868 | if (AttachmentsModule != null) |
2869 | AttachmentsModule.AttachObject(sp, grp, 0, false, false, false); | 2869 | AttachmentsModule.AttachObject(sp, grp, 0, false, false, false, true); |
2870 | } | 2870 | } |
2871 | else | 2871 | else |
2872 | { | 2872 | { |