aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-09-06 00:29:37 +0100
committerJustin Clark-Casey (justincc)2011-09-06 00:29:37 +0100
commit0cb0140a1d652c3ba47f1c9000d1ba81c8e786f8 (patch)
tree92b14b8fc3549efe9c84cb2aedb1697bb8fa026e /OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
parentTry disabling the inconsistent attachment state check to see if this actually... (diff)
downloadopensim-SC_OLD-0cb0140a1d652c3ba47f1c9000d1ba81c8e786f8.zip
opensim-SC_OLD-0cb0140a1d652c3ba47f1c9000d1ba81c8e786f8.tar.gz
opensim-SC_OLD-0cb0140a1d652c3ba47f1c9000d1ba81c8e786f8.tar.bz2
opensim-SC_OLD-0cb0140a1d652c3ba47f1c9000d1ba81c8e786f8.tar.xz
Stop the pointless double setting of every attachment in AvatarAppearance.
The second was already being filtered out so this has no user level effect
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs8
1 files changed, 2 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 4881499..e2e697e 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -242,7 +242,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
242 { 242 {
243// m_log.DebugFormat( 243// m_log.DebugFormat(
244// "[ATTACHMENTS MODULE]: Attaching object {0} {1} to {2} point {3} from ground (silent = {4})", 244// "[ATTACHMENTS MODULE]: Attaching object {0} {1} to {2} point {3} from ground (silent = {4})",
245// group.Name, group.LocalId, sp.Name, AttachmentPt, silent); 245// group.Name, group.LocalId, sp.Name, attachmentPt, silent);
246 246
247 if (sp.GetAttachments(attachmentPt).Contains(group)) 247 if (sp.GetAttachments(attachmentPt).Contains(group))
248 { 248 {
@@ -356,8 +356,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
356 { 356 {
357 if (att == null) 357 if (att == null)
358 DetachSingleAttachmentToInv(itemID, sp.ControllingClient); 358 DetachSingleAttachmentToInv(itemID, sp.ControllingClient);
359 else
360 ShowAttachInUserInventory(att, sp, itemID, AttachmentPt);
361 } 359 }
362 360
363 return att; 361 return att;
@@ -386,9 +384,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
386 384
387 if (objatt != null) 385 if (objatt != null)
388 { 386 {
389 // Loading the inventory from XML will have set this, but 387 // HasGroupChanged is being set from within RezObject. Ideally it would be set by the caller.
390 // there is no way the object could have changed yet,
391 // since scripts aren't running yet. So, clear it here.
392 objatt.HasGroupChanged = false; 388 objatt.HasGroupChanged = false;
393 bool tainted = false; 389 bool tainted = false;
394 if (attachmentPt != 0 && attachmentPt != objatt.AttachmentPoint) 390 if (attachmentPt != 0 && attachmentPt != objatt.AttachmentPoint)