diff options
| author | Melanie | 2010-10-29 21:22:35 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-29 21:22:35 +0100 |
| commit | 69c1e0b2f7cfaa195a8496aff1fb23c24a645c6e (patch) | |
| tree | 2a046b787abced2a1e68b1e62831e0b4f3778323 /OpenSim/ApplicationPlugins/RemoteController | |
| parent | Add my work on top of cmickeyb's (diff) | |
| parent | Rename the new default texture to be consistent with the others (diff) | |
| download | opensim-SC_OLD-69c1e0b2f7cfaa195a8496aff1fb23c24a645c6e.zip opensim-SC_OLD-69c1e0b2f7cfaa195a8496aff1fb23c24a645c6e.tar.gz opensim-SC_OLD-69c1e0b2f7cfaa195a8496aff1fb23c24a645c6e.tar.bz2 opensim-SC_OLD-69c1e0b2f7cfaa195a8496aff1fb23c24a645c6e.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/ApplicationPlugins/RemoteController')
| -rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index d6fe347..2e1c87e 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
| @@ -1732,12 +1732,12 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
| 1732 | } | 1732 | } |
| 1733 | 1733 | ||
| 1734 | // Attachments | 1734 | // Attachments |
| 1735 | Dictionary<int, AvatarAttachment> attachments = avatarAppearance.Attachments; | 1735 | List<AvatarAttachment> attachments = avatarAppearance.GetAttachments(); |
| 1736 | 1736 | ||
| 1737 | foreach (KeyValuePair<int, AvatarAttachment> attachment in attachments) | 1737 | foreach (AvatarAttachment attachment in attachments) |
| 1738 | { | 1738 | { |
| 1739 | int attachpoint = attachment.Value.AttachPoint; | 1739 | int attachpoint = attachment.AttachPoint; |
| 1740 | UUID itemID = attachment.Value.ItemID; | 1740 | UUID itemID = attachment.ItemID; |
| 1741 | 1741 | ||
| 1742 | if (itemID != UUID.Zero) | 1742 | if (itemID != UUID.Zero) |
| 1743 | { | 1743 | { |