aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneGraph.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs7
1 files changed, 0 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index fd13633..3007598 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -557,7 +557,6 @@ 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);
561 if (m_parentScene.Permissions.CanTakeObject(group.UUID, remoteClient.AgentId)) 560 if (m_parentScene.Permissions.CanTakeObject(group.UUID, remoteClient.AgentId))
562 { 561 {
563 // If the attachment point isn't the same as the one previously used 562 // If the attachment point isn't the same as the one previously used
@@ -565,7 +564,6 @@ namespace OpenSim.Region.Framework.Scenes
565 // and not in a weird location somewhere unknown. 564 // and not in a weird location somewhere unknown.
566 if (AttachmentPt != 0 && AttachmentPt != (uint)group.GetAttachmentPoint()) 565 if (AttachmentPt != 0 && AttachmentPt != (uint)group.GetAttachmentPoint())
567 { 566 {
568 m_log.DebugFormat("[SCENE GRAPH]: AttachObject 1 got {0}", group.UUID);
569 attachPos = Vector3.Zero; 567 attachPos = Vector3.Zero;
570 } 568 }
571 569
@@ -574,7 +572,6 @@ namespace OpenSim.Region.Framework.Scenes
574 { 572 {
575 // Check object for stored attachment point 573 // Check object for stored attachment point
576 AttachmentPt = (uint)group.GetAttachmentPoint(); 574 AttachmentPt = (uint)group.GetAttachmentPoint();
577 m_log.DebugFormat("[SCENE GRAPH]: AttachObject 2 got {0}", group.UUID);
578 } 575 }
579 576
580 // if we still didn't find a suitable attachment point....... 577 // if we still didn't find a suitable attachment point.......
@@ -583,11 +580,9 @@ namespace OpenSim.Region.Framework.Scenes
583 // 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.
584 AttachmentPt = (uint)AttachmentPoint.LeftHand; 581 AttachmentPt = (uint)AttachmentPoint.LeftHand;
585 attachPos = Vector3.Zero; 582 attachPos = Vector3.Zero;
586 m_log.DebugFormat("[SCENE GRAPH]: AttachObject 3 got {0}", group.UUID);
587 583
588 } 584 }
589 585
590 m_log.DebugFormat("[SCENE GRAPH]: AttachObject 4 got {0}", group.UUID);
591 586
592 group.SetAttachmentPoint(Convert.ToByte(AttachmentPt)); 587 group.SetAttachmentPoint(Convert.ToByte(AttachmentPt));
593 group.AbsolutePosition = attachPos; 588 group.AbsolutePosition = attachPos;
@@ -597,12 +592,10 @@ namespace OpenSim.Region.Framework.Scenes
597 592
598 if (group.GetFromItemID() == UUID.Zero) 593 if (group.GetFromItemID() == UUID.Zero)
599 { 594 {
600 m_log.DebugFormat("[SCENE GRAPH]: AttachObject 5 got {0}", group.UUID);
601 m_parentScene.attachObjectAssetStore(remoteClient, group, remoteClient.AgentId, out itemId); 595 m_parentScene.attachObjectAssetStore(remoteClient, group, remoteClient.AgentId, out itemId);
602 } 596 }
603 else 597 else
604 { 598 {
605 m_log.DebugFormat("[SCENE GRAPH]: AttachObject 6 got {0}", group.GetFromItemID());
606 itemId = group.GetFromItemID(); 599 itemId = group.GetFromItemID();
607 } 600 }
608 601