aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-08-30 22:06:24 +0100
committerJustin Clark-Casey (justincc)2011-08-30 22:06:24 +0100
commite7a515bab0e46c228f8f543397f97b7ba2f0df3c (patch)
tree9c5bd0f2aea3f59b5a8b82da74b336f78f74c17e /OpenSim/Framework
parentMerge branch 'master' into bulletsim (diff)
downloadopensim-SC_OLD-e7a515bab0e46c228f8f543397f97b7ba2f0df3c.zip
opensim-SC_OLD-e7a515bab0e46c228f8f543397f97b7ba2f0df3c.tar.gz
opensim-SC_OLD-e7a515bab0e46c228f8f543397f97b7ba2f0df3c.tar.bz2
opensim-SC_OLD-e7a515bab0e46c228f8f543397f97b7ba2f0df3c.tar.xz
Fix bug where attachments were remaining on the avatar after being dropped.
If the inventory service is configured not to allow deletion then these will not disappear from inventory
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/AvatarAppearance.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index ab4ed66..7c6295d 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -383,9 +383,11 @@ namespace OpenSim.Framework
383// DEBUG OFF 383// DEBUG OFF
384 384
385 /// <summary> 385 /// <summary>
386 /// Get a list of the attachments, note that there may be 386 /// Get a list of the attachments.
387 /// duplicate attachpoints
388 /// </summary> 387 /// </summary>
388 /// <remarks>
389 /// There may be duplicate attachpoints
390 /// </remarks>
389 public List<AvatarAttachment> GetAttachments() 391 public List<AvatarAttachment> GetAttachments()
390 { 392 {
391 List<AvatarAttachment> alist = new List<AvatarAttachment>(); 393 List<AvatarAttachment> alist = new List<AvatarAttachment>();
@@ -487,6 +489,7 @@ namespace OpenSim.Framework
487 // And remove the list if there are no more attachments here 489 // And remove the list if there are no more attachments here
488 if (m_attachments[kvp.Key].Count == 0) 490 if (m_attachments[kvp.Key].Count == 0)
489 m_attachments.Remove(kvp.Key); 491 m_attachments.Remove(kvp.Key);
492
490 return true; 493 return true;
491 } 494 }
492 } 495 }