From ed555801a4e91af69f4074b18bae4d851527fcc2 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Mon, 29 Aug 2016 19:41:26 +0100 Subject: [PATCH] mantis 8013: change attachment group to active group on attach from inventory --- .../CoreModules/Avatar/Attachments/AttachmentsModule.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index d227974821..d5c81cef49 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs @@ -1118,13 +1118,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments SceneObjectGroup objatt; + UUID rezGroupID = sp.ControllingClient.ActiveGroupId; + if (itemID != UUID.Zero) objatt = m_invAccessModule.RezObject(sp.ControllingClient, - itemID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true, + itemID, rezGroupID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true, false, false, sp.UUID, true); else - objatt = m_invAccessModule.RezObject(sp.ControllingClient, - null, assetID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true, + objatt = m_invAccessModule.RezObject(sp.ControllingClient, + null, rezGroupID, assetID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true, false, false, sp.UUID, true); if (objatt == null)