diff options
author | UbitUmarov | 2016-08-29 19:41:26 +0100 |
---|---|---|
committer | UbitUmarov | 2016-08-29 19:41:26 +0100 |
commit | ed555801a4e91af69f4074b18bae4d851527fcc2 (patch) | |
tree | 8c85ffcef7946501a89ccee0b6cc933843970db9 /OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |
parent | ubOde add a missing decimal dot :) (diff) | |
download | opensim-SC_OLD-ed555801a4e91af69f4074b18bae4d851527fcc2.zip opensim-SC_OLD-ed555801a4e91af69f4074b18bae4d851527fcc2.tar.gz opensim-SC_OLD-ed555801a4e91af69f4074b18bae4d851527fcc2.tar.bz2 opensim-SC_OLD-ed555801a4e91af69f4074b18bae4d851527fcc2.tar.xz |
mantis 8013: change attachment group to active group on attach from inventory
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index d227974..d5c81ce 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 | |||
1118 | 1118 | ||
1119 | SceneObjectGroup objatt; | 1119 | SceneObjectGroup objatt; |
1120 | 1120 | ||
1121 | UUID rezGroupID = sp.ControllingClient.ActiveGroupId; | ||
1122 | |||
1121 | if (itemID != UUID.Zero) | 1123 | if (itemID != UUID.Zero) |
1122 | objatt = m_invAccessModule.RezObject(sp.ControllingClient, | 1124 | objatt = m_invAccessModule.RezObject(sp.ControllingClient, |
1123 | itemID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true, | 1125 | itemID, rezGroupID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true, |
1124 | false, false, sp.UUID, true); | 1126 | false, false, sp.UUID, true); |
1125 | else | 1127 | else |
1126 | objatt = m_invAccessModule.RezObject(sp.ControllingClient, | 1128 | objatt = m_invAccessModule.RezObject(sp.ControllingClient, |
1127 | null, assetID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true, | 1129 | null, rezGroupID, assetID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true, |
1128 | false, false, sp.UUID, true); | 1130 | false, false, sp.UUID, true); |
1129 | 1131 | ||
1130 | if (objatt == null) | 1132 | if (objatt == null) |