diff options
| author | Melanie | 2013-03-18 22:56:03 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-18 22:56:03 +0000 |
| commit | fcecfc81bbd6ee8ebfa2dc0585d92ebf899358c1 (patch) | |
| tree | d942d65d0687ac8d30ec41a7c3a6188ddc2d370e /OpenSim/Region/Framework | |
| parent | * Add a Max Payload size property to the Websocket Server Handler. If you ... (diff) | |
| download | opensim-SC_OLD-fcecfc81bbd6ee8ebfa2dc0585d92ebf899358c1.zip opensim-SC_OLD-fcecfc81bbd6ee8ebfa2dc0585d92ebf899358c1.tar.gz opensim-SC_OLD-fcecfc81bbd6ee8ebfa2dc0585d92ebf899358c1.tar.bz2 opensim-SC_OLD-fcecfc81bbd6ee8ebfa2dc0585d92ebf899358c1.tar.xz | |
Multiattach, part 1
Conflicts:
OpenSim/Framework/AvatarAppearance.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
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 620ec22..46daab3 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, bool temp); | 86 | bool AttachObject(IScenePresence sp, SceneObjectGroup grp, uint AttachmentPt, bool silent, bool temp, bool append); |
| 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 14dac7a..3c91c5b 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -2741,7 +2741,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2741 | RootPrim.RemFlag(PrimFlags.TemporaryOnRez); | 2741 | RootPrim.RemFlag(PrimFlags.TemporaryOnRez); |
| 2742 | 2742 | ||
| 2743 | if (AttachmentsModule != null) | 2743 | if (AttachmentsModule != null) |
| 2744 | AttachmentsModule.AttachObject(sp, grp, 0, false, false); | 2744 | AttachmentsModule.AttachObject(sp, grp, 0, false, false, true); |
| 2745 | } | 2745 | } |
| 2746 | else | 2746 | else |
| 2747 | { | 2747 | { |