diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 3bd079a..fd13633 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -557,6 +557,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
557 | SceneObjectGroup group = GetGroupByPrim(objectLocalID); | 557 | SceneObjectGroup group = GetGroupByPrim(objectLocalID); |
558 | if (group != null) | 558 | if (group != null) |
559 | { | 559 | { |
560 | m_log.DebugFormat("[SCENE GRAPH]: AttachObject got {0}", group.UUID); | ||
560 | if (m_parentScene.Permissions.CanTakeObject(group.UUID, remoteClient.AgentId)) | 561 | if (m_parentScene.Permissions.CanTakeObject(group.UUID, remoteClient.AgentId)) |
561 | { | 562 | { |
562 | // If the attachment point isn't the same as the one previously used | 563 | // If the attachment point isn't the same as the one previously used |
@@ -564,6 +565,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
564 | // and not in a weird location somewhere unknown. | 565 | // and not in a weird location somewhere unknown. |
565 | if (AttachmentPt != 0 && AttachmentPt != (uint)group.GetAttachmentPoint()) | 566 | if (AttachmentPt != 0 && AttachmentPt != (uint)group.GetAttachmentPoint()) |
566 | { | 567 | { |
568 | m_log.DebugFormat("[SCENE GRAPH]: AttachObject 1 got {0}", group.UUID); | ||
567 | attachPos = Vector3.Zero; | 569 | attachPos = Vector3.Zero; |
568 | } | 570 | } |
569 | 571 | ||
@@ -572,7 +574,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
572 | { | 574 | { |
573 | // Check object for stored attachment point | 575 | // Check object for stored attachment point |
574 | AttachmentPt = (uint)group.GetAttachmentPoint(); | 576 | AttachmentPt = (uint)group.GetAttachmentPoint(); |
575 | } | 577 | m_log.DebugFormat("[SCENE GRAPH]: AttachObject 2 got {0}", group.UUID); |
578 | } | ||
576 | 579 | ||
577 | // if we still didn't find a suitable attachment point....... | 580 | // if we still didn't find a suitable attachment point....... |
578 | if (AttachmentPt == 0) | 581 | if (AttachmentPt == 0) |
@@ -580,8 +583,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
580 | // Stick it on left hand with Zero Offset from the attachment point. | 583 | // Stick it on left hand with Zero Offset from the attachment point. |
581 | AttachmentPt = (uint)AttachmentPoint.LeftHand; | 584 | AttachmentPt = (uint)AttachmentPoint.LeftHand; |
582 | attachPos = Vector3.Zero; | 585 | attachPos = Vector3.Zero; |
586 | m_log.DebugFormat("[SCENE GRAPH]: AttachObject 3 got {0}", group.UUID); | ||
587 | |||
583 | } | 588 | } |
584 | 589 | ||
590 | m_log.DebugFormat("[SCENE GRAPH]: AttachObject 4 got {0}", group.UUID); | ||
591 | |||
585 | group.SetAttachmentPoint(Convert.ToByte(AttachmentPt)); | 592 | group.SetAttachmentPoint(Convert.ToByte(AttachmentPt)); |
586 | group.AbsolutePosition = attachPos; | 593 | group.AbsolutePosition = attachPos; |
587 | 594 | ||
@@ -590,10 +597,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
590 | 597 | ||
591 | if (group.GetFromItemID() == UUID.Zero) | 598 | if (group.GetFromItemID() == UUID.Zero) |
592 | { | 599 | { |
600 | m_log.DebugFormat("[SCENE GRAPH]: AttachObject 5 got {0}", group.UUID); | ||
593 | m_parentScene.attachObjectAssetStore(remoteClient, group, remoteClient.AgentId, out itemId); | 601 | m_parentScene.attachObjectAssetStore(remoteClient, group, remoteClient.AgentId, out itemId); |
594 | } | 602 | } |
595 | else | 603 | else |
596 | { | 604 | { |
605 | m_log.DebugFormat("[SCENE GRAPH]: AttachObject 6 got {0}", group.GetFromItemID()); | ||
597 | itemId = group.GetFromItemID(); | 606 | itemId = group.GetFromItemID(); |
598 | } | 607 | } |
599 | 608 | ||
@@ -611,6 +620,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
611 | remoteClient.SendAgentAlertMessage("You don't have sufficient permissions to attach this object", false); | 620 | remoteClient.SendAgentAlertMessage("You don't have sufficient permissions to attach this object", false); |
612 | } | 621 | } |
613 | } | 622 | } |
623 | else | ||
624 | m_log.DebugFormat("[SCENE GRAPH]: AttachObject found no such scene object {0}", objectLocalID); | ||
614 | } | 625 | } |
615 | 626 | ||
616 | protected internal ScenePresence CreateAndAddChildScenePresence(IClientAPI client, AvatarAppearance appearance) | 627 | protected internal ScenePresence CreateAndAddChildScenePresence(IClientAPI client, AvatarAppearance appearance) |