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/Services | |
| 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-69c1e0b2f7cfaa195a8496aff1fb23c24a645c6e.zip opensim-SC-69c1e0b2f7cfaa195a8496aff1fb23c24a645c6e.tar.gz opensim-SC-69c1e0b2f7cfaa195a8496aff1fb23c24a645c6e.tar.bz2 opensim-SC-69c1e0b2f7cfaa195a8496aff1fb23c24a645c6e.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/Interfaces/IAvatarService.cs | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/OpenSim/Services/Interfaces/IAvatarService.cs b/OpenSim/Services/Interfaces/IAvatarService.cs index 93b977b..eaa6534 100644 --- a/OpenSim/Services/Interfaces/IAvatarService.cs +++ b/OpenSim/Services/Interfaces/IAvatarService.cs | |||
| @@ -178,17 +178,11 @@ namespace OpenSim.Services.Interfaces | |||
| 178 | Data["UnderShirtAsset"] = appearance.UnderShirtAsset.ToString(); | 178 | Data["UnderShirtAsset"] = appearance.UnderShirtAsset.ToString(); |
| 179 | 179 | ||
| 180 | // Attachments | 180 | // Attachments |
| 181 | Hashtable attachs = appearance.GetAttachments(); | 181 | List<AvatarAttachment> attachments = appearance.GetAttachments(); |
| 182 | if (attachs != null) | 182 | foreach (AvatarAttachment attach in attachments) |
| 183 | foreach (DictionaryEntry dentry in attachs) | 183 | { |
| 184 | { | 184 | Data["_ap_" + attach.AttachPoint] = attach.ItemID.ToString(); |
| 185 | if (dentry.Value != null) | 185 | } |
| 186 | { | ||
| 187 | Hashtable tab = (Hashtable)dentry.Value; | ||
| 188 | if (tab.ContainsKey("item") && tab["item"] != null) | ||
| 189 | Data["_ap_" + dentry.Key] = tab["item"].ToString(); | ||
| 190 | } | ||
| 191 | } | ||
| 192 | } | 186 | } |
| 193 | 187 | ||
| 194 | public AvatarAppearance ToAvatarAppearance(UUID owner) | 188 | public AvatarAppearance ToAvatarAppearance(UUID owner) |