diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 7771831..3007598 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -442,7 +442,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
442 | if (group != null) | 442 | if (group != null) |
443 | { | 443 | { |
444 | //group.DetachToGround(); | 444 | //group.DetachToGround(); |
445 | m_parentScene.DetachSingleAttachmentToInv(group.GetFromAssetID(), remoteClient); | 445 | m_parentScene.DetachSingleAttachmentToInv(group.GetFromItemID(), remoteClient); |
446 | } | 446 | } |
447 | } | 447 | } |
448 | 448 | ||
@@ -489,7 +489,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
489 | // Calls attach with a Zero position | 489 | // Calls attach with a Zero position |
490 | // | 490 | // |
491 | AttachObject(remoteClient, objectLocalID, AttachmentPt, rot, Vector3.Zero, false); | 491 | AttachObject(remoteClient, objectLocalID, AttachmentPt, rot, Vector3.Zero, false); |
492 | m_parentScene.SendAttachEvent(objectLocalID, part.ParentGroup.GetFromAssetID(), remoteClient.AgentId); | 492 | m_parentScene.SendAttachEvent(objectLocalID, part.ParentGroup.GetFromItemID(), remoteClient.AgentId); |
493 | } | 493 | } |
494 | 494 | ||
495 | public SceneObjectGroup RezSingleAttachment( | 495 | public SceneObjectGroup RezSingleAttachment( |
@@ -536,14 +536,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
536 | if (entity is SceneObjectGroup) | 536 | if (entity is SceneObjectGroup) |
537 | { | 537 | { |
538 | group = (SceneObjectGroup)entity; | 538 | group = (SceneObjectGroup)entity; |
539 | if (group.GetFromAssetID() == itemID) | 539 | if (group.GetFromItemID() == itemID) |
540 | { | 540 | { |
541 | m_parentScene.SendAttachEvent(group.LocalId, itemID, UUID.Zero); | 541 | m_parentScene.SendAttachEvent(group.LocalId, itemID, UUID.Zero); |
542 | group.DetachToInventoryPrep(); | 542 | group.DetachToInventoryPrep(); |
543 | m_log.Debug("[DETACH]: Saving attachpoint: " + | 543 | m_log.Debug("[DETACH]: Saving attachpoint: " + |
544 | ((uint)group.GetAttachmentPoint()).ToString()); | 544 | ((uint)group.GetAttachmentPoint()).ToString()); |
545 | m_parentScene.updateKnownAsset(remoteClient, group, | 545 | m_parentScene.UpdateKnownItem(remoteClient, group, |
546 | group.GetFromAssetID(), group.OwnerID); | 546 | group.GetFromItemID(), group.OwnerID); |
547 | m_parentScene.DeleteSceneObject(group, false); | 547 | m_parentScene.DeleteSceneObject(group, false); |
548 | return; | 548 | return; |
549 | } | 549 | } |
@@ -572,7 +572,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
572 | { | 572 | { |
573 | // Check object for stored attachment point | 573 | // Check object for stored attachment point |
574 | AttachmentPt = (uint)group.GetAttachmentPoint(); | 574 | AttachmentPt = (uint)group.GetAttachmentPoint(); |
575 | } | 575 | } |
576 | 576 | ||
577 | // if we still didn't find a suitable attachment point....... | 577 | // if we still didn't find a suitable attachment point....... |
578 | if (AttachmentPt == 0) | 578 | if (AttachmentPt == 0) |
@@ -580,21 +580,23 @@ namespace OpenSim.Region.Framework.Scenes | |||
580 | // Stick it on left hand with Zero Offset from the attachment point. | 580 | // Stick it on left hand with Zero Offset from the attachment point. |
581 | AttachmentPt = (uint)AttachmentPoint.LeftHand; | 581 | AttachmentPt = (uint)AttachmentPoint.LeftHand; |
582 | attachPos = Vector3.Zero; | 582 | attachPos = Vector3.Zero; |
583 | |||
583 | } | 584 | } |
584 | 585 | ||
586 | |||
585 | group.SetAttachmentPoint(Convert.ToByte(AttachmentPt)); | 587 | group.SetAttachmentPoint(Convert.ToByte(AttachmentPt)); |
586 | group.AbsolutePosition = attachPos; | 588 | group.AbsolutePosition = attachPos; |
587 | 589 | ||
588 | // Saves and gets assetID | 590 | // Saves and gets itemID |
589 | UUID itemId; | 591 | UUID itemId; |
590 | 592 | ||
591 | if (group.GetFromAssetID() == UUID.Zero) | 593 | if (group.GetFromItemID() == UUID.Zero) |
592 | { | 594 | { |
593 | m_parentScene.attachObjectAssetStore(remoteClient, group, remoteClient.AgentId, out itemId); | 595 | m_parentScene.attachObjectAssetStore(remoteClient, group, remoteClient.AgentId, out itemId); |
594 | } | 596 | } |
595 | else | 597 | else |
596 | { | 598 | { |
597 | itemId = group.GetFromAssetID(); | 599 | itemId = group.GetFromItemID(); |
598 | } | 600 | } |
599 | 601 | ||
600 | m_parentScene.AttachObject(remoteClient, AttachmentPt, itemId, group); | 602 | m_parentScene.AttachObject(remoteClient, AttachmentPt, itemId, group); |
@@ -611,6 +613,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
611 | remoteClient.SendAgentAlertMessage("You don't have sufficient permissions to attach this object", false); | 613 | remoteClient.SendAgentAlertMessage("You don't have sufficient permissions to attach this object", false); |
612 | } | 614 | } |
613 | } | 615 | } |
616 | else | ||
617 | m_log.DebugFormat("[SCENE GRAPH]: AttachObject found no such scene object {0}", objectLocalID); | ||
614 | } | 618 | } |
615 | 619 | ||
616 | protected internal ScenePresence CreateAndAddChildScenePresence(IClientAPI client, AvatarAppearance appearance) | 620 | protected internal ScenePresence CreateAndAddChildScenePresence(IClientAPI client, AvatarAppearance appearance) |
@@ -1304,7 +1308,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1304 | group.UpdateGroupPosition(pos); | 1308 | group.UpdateGroupPosition(pos); |
1305 | group.RootPart.IsAttachment = false; | 1309 | group.RootPart.IsAttachment = false; |
1306 | group.AbsolutePosition = group.RootPart.AttachedPos; | 1310 | group.AbsolutePosition = group.RootPart.AttachedPos; |
1307 | m_parentScene.updateKnownAsset(remoteClient, group, group.GetFromAssetID(), group.OwnerID); | 1311 | m_parentScene.UpdateKnownItem(remoteClient, group, group.GetFromItemID(), group.OwnerID); |
1308 | group.SetAttachmentPoint(attachmentPoint); | 1312 | group.SetAttachmentPoint(attachmentPoint); |
1309 | 1313 | ||
1310 | } | 1314 | } |