diff options
| author | Melanie | 2010-06-14 02:49:15 +0100 |
|---|---|---|
| committer | Melanie | 2010-06-14 02:49:15 +0100 |
| commit | fdf648bcf3cecc2236cc6761d33f3df5e0af136d (patch) | |
| tree | db65a301f98b6b998a901cdd887fec755e6d73dd /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | D.U.H. #2. Inverted test. Again. Argh! (diff) | |
| parent | Fixes attachments coming back upon being detached in neighbouring regions and... (diff) | |
| download | opensim-SC-fdf648bcf3cecc2236cc6761d33f3df5e0af136d.zip opensim-SC-fdf648bcf3cecc2236cc6761d33f3df5e0af136d.tar.gz opensim-SC-fdf648bcf3cecc2236cc6761d33f3df5e0af136d.tar.bz2 opensim-SC-fdf648bcf3cecc2236cc6761d33f3df5e0af136d.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 6d2cd88..d4fc6cd 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -3390,6 +3390,7 @@ Console.WriteLine("Scripted Sit ofset {0}", m_pos); | |||
| 3390 | { | 3390 | { |
| 3391 | if (cAgent.Attachments != null) | 3391 | if (cAgent.Attachments != null) |
| 3392 | { | 3392 | { |
| 3393 | m_appearance.ClearAttachments(); | ||
| 3393 | foreach (AttachmentData att in cAgent.Attachments) | 3394 | foreach (AttachmentData att in cAgent.Attachments) |
| 3394 | { | 3395 | { |
| 3395 | m_appearance.SetAttachment(att.AttachPoint, att.ItemID, att.AssetID); | 3396 | m_appearance.SetAttachment(att.AttachPoint, att.ItemID, att.AssetID); |