diff options
author | Diva Canto | 2009-08-16 19:35:14 -0700 |
---|---|---|
committer | Diva Canto | 2009-08-16 19:35:14 -0700 |
commit | 50056871b89be654a77310ac8cb49995dd1ee5f6 (patch) | |
tree | 6cf94cd343b4744c8148267c5edca70e1853ef6a | |
parent | Removing the conditional for assetID=Zero upon rezzing attachments on login. (diff) | |
download | opensim-SC-50056871b89be654a77310ac8cb49995dd1ee5f6.zip opensim-SC-50056871b89be654a77310ac8cb49995dd1ee5f6.tar.gz opensim-SC-50056871b89be654a77310ac8cb49995dd1ee5f6.tar.bz2 opensim-SC-50056871b89be654a77310ac8cb49995dd1ee5f6.tar.xz |
IAvatarFactory.UpdateDatabase gets the assetID and not the object's inworld UUID.
-rw-r--r-- | OpenSim/Framework/InventoryItemBase.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs index b5bf92f..7150c82 100644 --- a/OpenSim/Framework/InventoryItemBase.cs +++ b/OpenSim/Framework/InventoryItemBase.cs | |||
@@ -364,6 +364,12 @@ namespace OpenSim.Framework | |||
364 | ID = id; | 364 | ID = id; |
365 | } | 365 | } |
366 | 366 | ||
367 | public InventoryItemBase(UUID id, UUID owner) | ||
368 | { | ||
369 | ID = id; | ||
370 | Owner = owner; | ||
371 | } | ||
372 | |||
367 | public object Clone() | 373 | public object Clone() |
368 | { | 374 | { |
369 | return MemberwiseClone(); | 375 | return MemberwiseClone(); |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index f5e9be1..46777e1 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -2309,7 +2309,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
2309 | ScenePresence presence; | 2309 | ScenePresence presence; |
2310 | if (TryGetAvatar(remoteClient.AgentId, out presence)) | 2310 | if (TryGetAvatar(remoteClient.AgentId, out presence)) |
2311 | { | 2311 | { |
2312 | presence.Appearance.SetAttachment((int)AttachmentPt, itemID, att.UUID); | 2312 | InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID, remoteClient.AgentId)); |
2313 | |||
2314 | presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/); | ||
2313 | IAvatarFactory ava = RequestModuleInterface<IAvatarFactory>(); | 2315 | IAvatarFactory ava = RequestModuleInterface<IAvatarFactory>(); |
2314 | if (ava != null) | 2316 | if (ava != null) |
2315 | { | 2317 | { |