aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
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/Framework
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/Framework')
-rw-r--r--OpenSim/Framework/AvatarAppearance.cs14
1 files changed, 10 insertions, 4 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index aed9087..0b0afeb 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -402,8 +402,13 @@ namespace OpenSim.Framework
402 402
403 internal void AppendAttachment(AvatarAttachment attach) 403 internal void AppendAttachment(AvatarAttachment attach)
404 { 404 {
405 if (! m_attachments.ContainsKey(attach.AttachPoint)) 405// m_log.DebugFormat(
406// "[AVATAR APPEARNCE]: Appending itemID={0}, assetID={1} at {2}",
407// attach.ItemID, attach.AssetID, attach.AttachPoint);
408
409 if (!m_attachments.ContainsKey(attach.AttachPoint))
406 m_attachments[attach.AttachPoint] = new List<AvatarAttachment>(); 410 m_attachments[attach.AttachPoint] = new List<AvatarAttachment>();
411
407 m_attachments[attach.AttachPoint].Add(attach); 412 m_attachments[attach.AttachPoint].Add(attach);
408 } 413 }
409 414
@@ -430,13 +435,13 @@ namespace OpenSim.Framework
430 /// </returns> 435 /// </returns>
431 public bool SetAttachment(int attachpoint, UUID item, UUID asset) 436 public bool SetAttachment(int attachpoint, UUID item, UUID asset)
432 { 437 {
433 if (attachpoint == 0)
434 return false;
435
436// m_log.DebugFormat( 438// m_log.DebugFormat(
437// "[AVATAR APPEARANCE]: Setting attachment at {0} with item ID {1}, asset ID {2}", 439// "[AVATAR APPEARANCE]: Setting attachment at {0} with item ID {1}, asset ID {2}",
438// attachpoint, item, asset); 440// attachpoint, item, asset);
439 441
442 if (attachpoint == 0)
443 return false;
444
440 if (item == UUID.Zero) 445 if (item == UUID.Zero)
441 { 446 {
442 if (m_attachments.ContainsKey(attachpoint)) 447 if (m_attachments.ContainsKey(attachpoint))
@@ -465,6 +470,7 @@ namespace OpenSim.Framework
465 { 470 {
466 ReplaceAttachment(new AvatarAttachment(attachpoint,item, asset)); 471 ReplaceAttachment(new AvatarAttachment(attachpoint,item, asset));
467 } 472 }
473
468 return true; 474 return true;
469 } 475 }
470 476