diff options
author | Melanie | 2012-08-14 00:12:15 +0100 |
---|---|---|
committer | Melanie | 2012-08-14 00:12:15 +0100 |
commit | fe4c3a37c0a4d41c410ef99003c7ab437bdbc5f0 (patch) | |
tree | 1d3f120ba1f30fa37acec6563cc235be22b5a69a /OpenSim/Region/Framework | |
parent | attempt at replicating behaviour of llList2thing functions in SL (diff) | |
download | opensim-SC-fe4c3a37c0a4d41c410ef99003c7ab437bdbc5f0.zip opensim-SC-fe4c3a37c0a4d41c410ef99003c7ab437bdbc5f0.tar.gz opensim-SC-fe4c3a37c0a4d41c410ef99003c7ab437bdbc5f0.tar.bz2 opensim-SC-fe4c3a37c0a4d41c410ef99003c7ab437bdbc5f0.tar.xz |
Lay some groundwork for temp attachments. Decouple attachments from inventory.
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 d5200b7..8155eab 100644 --- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | |||
@@ -83,7 +83,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
83 | /// <param name="AttachmentPt"></param> | 83 | /// <param name="AttachmentPt"></param> |
84 | /// <param name="silent"></param> | 84 | /// <param name="silent"></param> |
85 | /// <returns>true if the object was successfully attached, false otherwise</returns> | 85 | /// <returns>true if the object was successfully attached, false otherwise</returns> |
86 | bool AttachObject(IScenePresence sp, SceneObjectGroup grp, uint AttachmentPt, bool silent); | 86 | bool AttachObject(IScenePresence sp, SceneObjectGroup grp, uint AttachmentPt, bool silent, bool temp); |
87 | 87 | ||
88 | /// <summary> | 88 | /// <summary> |
89 | /// Rez an attachment from user inventory and change inventory status to match. | 89 | /// 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 40cfb72..0967c34 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2628,7 +2628,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2628 | RootPrim.RemFlag(PrimFlags.TemporaryOnRez); | 2628 | RootPrim.RemFlag(PrimFlags.TemporaryOnRez); |
2629 | 2629 | ||
2630 | if (AttachmentsModule != null) | 2630 | if (AttachmentsModule != null) |
2631 | AttachmentsModule.AttachObject(sp, grp, 0, false); | 2631 | AttachmentsModule.AttachObject(sp, grp, 0, false, false); |
2632 | } | 2632 | } |
2633 | else | 2633 | else |
2634 | { | 2634 | { |