aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorMelanie2010-06-14 04:50:27 +0100
committerMelanie2010-06-14 04:50:27 +0100
commitc75b94f9f9afe3ad384f326db9d54e6bff3bde91 (patch)
treeea10bef43fd64e95048b953ac9bb65976911881a /OpenSim/Region/Framework/Scenes/ScenePresence.cs
parentMerge branch 'master' into 0.7-post-fixes (diff)
parentFixes attachments coming back upon being detached in neighbouring regions and... (diff)
downloadopensim-SC_OLD-c75b94f9f9afe3ad384f326db9d54e6bff3bde91.zip
opensim-SC_OLD-c75b94f9f9afe3ad384f326db9d54e6bff3bde91.tar.gz
opensim-SC_OLD-c75b94f9f9afe3ad384f326db9d54e6bff3bde91.tar.bz2
opensim-SC_OLD-c75b94f9f9afe3ad384f326db9d54e6bff3bde91.tar.xz
Merge branch 'master' into 0.7-post-fixes
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index c1e835e..6c119c2 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3128,6 +3128,7 @@ namespace OpenSim.Region.Framework.Scenes
3128 { 3128 {
3129 if (cAgent.Attachments != null) 3129 if (cAgent.Attachments != null)
3130 { 3130 {
3131 m_appearance.ClearAttachments();
3131 foreach (AttachmentData att in cAgent.Attachments) 3132 foreach (AttachmentData att in cAgent.Attachments)
3132 { 3133 {
3133 m_appearance.SetAttachment(att.AttachPoint, att.ItemID, att.AssetID); 3134 m_appearance.SetAttachment(att.AttachPoint, att.ItemID, att.AssetID);