aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Avatar/Attachments
diff options
context:
space:
mode:
authorMelanie2013-03-29 02:15:47 +0000
committerMelanie2013-03-29 02:15:47 +0000
commit05810e48b013f4ca67beae68b2b7fb8030bd9c3b (patch)
tree1df064176b61b95d18dd6d8faf46676f6f684162 /OpenSim/Region/OptionalModules/Avatar/Attachments
parentMerge commit '2b142f2f9e888d5cb7317cc51c12ac7152c54459' into careminster (diff)
parentStop attempts to update/add existing attachments in user inventory when telep... (diff)
downloadopensim-SC-05810e48b013f4ca67beae68b2b7fb8030bd9c3b.zip
opensim-SC-05810e48b013f4ca67beae68b2b7fb8030bd9c3b.tar.gz
opensim-SC-05810e48b013f4ca67beae68b2b7fb8030bd9c3b.tar.bz2
opensim-SC-05810e48b013f4ca67beae68b2b7fb8030bd9c3b.tar.xz
Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminster
Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Attachments')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs b/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
index 8740f87..d56e39d 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
@@ -184,7 +184,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
184 hostPart.ParentGroup.RootPart.ScheduleFullUpdate(); 184 hostPart.ParentGroup.RootPart.ScheduleFullUpdate();
185 } 185 }
186 186
187 return attachmentsModule.AttachObject(target, hostPart.ParentGroup, (uint)attachmentPoint, false, true, true, true) ? 1 : 0; 187 return attachmentsModule.AttachObject(target, hostPart.ParentGroup, (uint)attachmentPoint, false, false, true, true) ? 1 : 0;
188 } 188 }
189 } 189 }
190} 190}