From ee115a83dfea5fd75d5c92b82de2aefa8d319e7f Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Wed, 11 Jul 2018 03:08:57 +0100
Subject: Bug fix: Object Wear was doing Add not replace
---
.../Avatar/Attachments/AttachmentsModule.cs | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 39443c3..e175db4 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -493,17 +493,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
return false;
}
- List<SceneObjectGroup> attachments = sp.GetAttachments(attachmentPt);
- if (attachments.Contains(group))
- {
-// if (DebugLevel > 0)
-// m_log.WarnFormat(
-// "[ATTACHMENTS MODULE]: Ignoring request to attach {0} {1} to {2} on {3} since it's already attached",
-// group.Name, group.LocalId, sp.Name, attachmentPt);
-
- return false;
- }
-
Vector3 attachPos = group.AbsolutePosition;
// TODO: this short circuits multiple attachments functionality in LL viewer 2.1+ and should
@@ -547,6 +536,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
attachPos = Vector3.Zero;
}
+ List<SceneObjectGroup> attachments = sp.GetAttachments(attachmentPt);
+ if (attachments.Contains(group))
+ {
+// if (DebugLevel > 0)
+// m_log.WarnFormat(
+// "[ATTACHMENTS MODULE]: Ignoring request to attach {0} {1} to {2} on {3} since it's already attached",
+// group.Name, group.LocalId, sp.Name, attachmentPt);
+
+ return false;
+ }
+
// If we already have 5, remove the oldest until only 4 are left. Skip over temp ones
while (attachments.Count >= 5)
{
--
cgit v1.1