diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index a9fa93e..f94aec7 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -1471,6 +1471,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
1471 | ScenePresence sp = GetScenePresence(grp.OwnerID); | 1471 | ScenePresence sp = GetScenePresence(grp.OwnerID); |
1472 | if (sp != null) | 1472 | if (sp != null) |
1473 | { | 1473 | { |
1474 | // hack assetID until we get assetID into the XML format. | ||
1475 | // LastOwnerID is used for group deeding, so when you do stuff | ||
1476 | // with the deeded object, it goes back to them | ||
1477 | |||
1478 | grp.SetFromAssetID(grp.RootPart.LastOwnerID); | ||
1474 | m_innerScene.AttachObject(sp.ControllingClient, grp.LocalId, (uint)0, grp.GroupRotation, grp.AbsolutePosition); | 1479 | m_innerScene.AttachObject(sp.ControllingClient, grp.LocalId, (uint)0, grp.GroupRotation, grp.AbsolutePosition); |
1475 | } | 1480 | } |
1476 | } | 1481 | } |
@@ -1560,6 +1565,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1560 | client.OnDeRezObject += DeRezObject; | 1565 | client.OnDeRezObject += DeRezObject; |
1561 | client.OnRezObject += RezObject; | 1566 | client.OnRezObject += RezObject; |
1562 | client.OnRezSingleAttachmentFromInv += m_innerScene.RezSingleAttachment; | 1567 | client.OnRezSingleAttachmentFromInv += m_innerScene.RezSingleAttachment; |
1568 | client.OnDetachAttachmentIntoInv += m_innerScene.DetachSingleAttachmentToInv; | ||
1563 | client.OnObjectAttach += m_innerScene.AttachObject; | 1569 | client.OnObjectAttach += m_innerScene.AttachObject; |
1564 | client.OnObjectDetach += m_innerScene.DetachObject; | 1570 | client.OnObjectDetach += m_innerScene.DetachObject; |
1565 | client.OnNameFromUUIDRequest += CommsManager.HandleUUIDNameRequest; | 1571 | client.OnNameFromUUIDRequest += CommsManager.HandleUUIDNameRequest; |