Merge branch 'avination-current' into careminster

author: Melanie 2013-06-11 21:03:02 +0100
committer: Melanie 2013-06-11 21:03:02 +0100
commit: 162dfd8a381999cf5883f4886b9b9aee3a3ad149 (patch)
tree: c1c20d043ede7be76e7131218585336ad9df0219 /OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
parent: Merge branch 'master' into careminster (diff)
parent: Put the "script saved" and "notecard saved" messages back into the bottom (diff)
download: opensim-SC_OLD-162dfd8a381999cf5883f4886b9b9aee3a3ad149.zip
opensim-SC_OLD-162dfd8a381999cf5883f4886b9b9aee3a3ad149.tar.gz
opensim-SC_OLD-162dfd8a381999cf5883f4886b9b9aee3a3ad149.tar.bz2
opensim-SC_OLD-162dfd8a381999cf5883f4886b9b9aee3a3ad149.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 0f03ad0..a60b314 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -1147,7 +1147,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                AttachmentPt &= 0x7f;
                // Calls attach with a Zero position
-                if (AttachObject(sp, part.ParentGroup, AttachmentPt, false, false, false, append))
+                if (AttachObject(sp, part.ParentGroup, AttachmentPt, false, false, true, append))
                {
                    if (DebugLevel > 0)
                        m_log.Debug(
author	Melanie	2013-06-11 21:03:02 +0100
committer	Melanie	2013-06-11 21:03:02 +0100
commit	162dfd8a381999cf5883f4886b9b9aee3a3ad149 (patch)
tree	c1c20d043ede7be76e7131218585336ad9df0219 /OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
parent	Merge branch 'master' into careminster (diff)
parent	Put the "script saved" and "notecard saved" messages back into the bottom (diff)
download	opensim-SC_OLD-162dfd8a381999cf5883f4886b9b9aee3a3ad149.zip opensim-SC_OLD-162dfd8a381999cf5883f4886b9b9aee3a3ad149.tar.gz opensim-SC_OLD-162dfd8a381999cf5883f4886b9b9aee3a3ad149.tar.bz2 opensim-SC_OLD-162dfd8a381999cf5883f4886b9b9aee3a3ad149.tar.xz

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 0f03ad0..a60b314 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -1147,7 +1147,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
1147	AttachmentPt &= 0x7f;	1147	AttachmentPt &= 0x7f;
1148		1148
1149	// Calls attach with a Zero position	1149	// Calls attach with a Zero position
1150	if (AttachObject(sp, part.ParentGroup, AttachmentPt, false, false, false, append))	1150	if (AttachObject(sp, part.ParentGroup, AttachmentPt, false, false, true, append))
1151	{	1151	{
1152	if (DebugLevel > 0)	1152	if (DebugLevel > 0)
1153	m_log.Debug(	1153	m_log.Debug(