- create entries in avatarattachments table when first attaching an object; fix issue 2512

- correct attachment offset; fix issue 2513
- thanks Thomas for the patches

1 files changed, 10 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 2189670..435ce77 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -542,12 +542,21 @@ namespace OpenSim.Region.Environment.Scenes
                             }
 
                             group.SetAttachmentPoint(Convert.ToByte(AttachmentPt));
+                            group.AbsolutePosition = attachPos;
 
                             // Saves and gets assetID
+                            UUID itemId;
                             if (group.GetFromAssetID() == UUID.Zero)
                             {
-                                m_parentScene.attachObjectAssetStore(remoteClient, group, remoteClient.AgentId);
+                                m_parentScene.attachObjectAssetStore(remoteClient, group, remoteClient.AgentId, out itemId);
                             }
+                            else
+                            {
+                                itemId = group.GetFromAssetID();
+                            }
+
+                            m_parentScene.AttachObject(remoteClient, AttachmentPt, itemId, group);
+
                             group.AttachToAgent(remoteClient.AgentId, AttachmentPt, attachPos);
                             // In case it is later dropped again, don't let
                             // it get cleaned up