ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 10:46:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

In SetAttachment, if the existing attachment has no asset id then carry on rather than abort.

Browse Source 
When a user logs in, the attachment item ids are pulled from persistence in the Avatars table.  However,
the asset ids are not saved.  When the avatar enters a simulator the attachments are set again.  If
we simply perform an item check then the asset ids (which are now present) are never set, and NPC attachments
later fail unless the attachment is detached and reattached.

Hopefully resolves part of http://opensimulator.org/mantis/view.php?id=5653
This commit is contained in:
Justin Clark-Casey (justincc)
2011-09-06 01:59:21 +01:00
parent c6ec573d10
commit b903d2ca96
4 changed files with 43 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Services/Interfaces/IAvatarService.cs
View File

@@ -262,7 +262,6 @@ namespace OpenSim.Services.Interfaces
UUID.Parse(Data["SkirtItem"]),
UUID.Parse(Data["SkirtAsset"]));
if (Data.ContainsKey("VisualParams"))
{
string[] vps = Data["VisualParams"].Split(new char[] {','});
@@ -291,7 +290,6 @@ namespace OpenSim.Services.Interfaces
}
}
// Attachments
Dictionary<string, string> attchs = new Dictionary<string, string>();
foreach (KeyValuePair<string, string> _kvp in Data)
@@ -308,7 +306,7 @@ namespace OpenSim.Services.Interfaces
UUID uuid = UUID.Zero;
UUID.TryParse(_kvp.Value, out uuid);
appearance.SetAttachment(point,uuid,UUID.Zero);
appearance.SetAttachment(point, uuid, UUID.Zero);
}
if (appearance.Wearables[AvatarWearable.BODY].Count == 0)