From 52963c180e26977ccb034e5966e818c99278887f Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Sat, 4 Oct 2008 16:45:38 +0000 Subject: Mantis #2330 Fixes use of the saved attachment point from asset --- OpenSim/Region/Environment/Scenes/InnerScene.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index f06b77f..432bbad 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs @@ -454,13 +454,13 @@ namespace OpenSim.Region.Environment.Scenes public SceneObjectGroup RezSingleAttachment( IClientAPI remoteClient, UUID itemID, uint AttachmentPt) { - SceneObjectGroup objatt = m_parentScene.RezObject(remoteClient, itemID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true, + SceneObjectGroup objatt = m_parentScene.RezObject(remoteClient, + itemID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true, false, false, remoteClient.AgentId, true); + if (objatt != null) { - objatt.SetAttachmentPoint(Convert.ToByte(AttachmentPt)); - AttachObject(remoteClient, objatt.LocalId, AttachmentPt, Quaternion.Identity, objatt.AbsolutePosition); objatt.ScheduleGroupForFullUpdate(); } @@ -531,9 +531,8 @@ namespace OpenSim.Region.Environment.Scenes AttachmentPt = (uint)AttachmentPoint.LeftHand; attachPos = Vector3.Zero; } - m_log.Debug("[ATTACH]: Using attachpoint: " + AttachmentPt.ToString()); - + group.SetAttachmentPoint(Convert.ToByte(AttachmentPt)); // Saves and gets assetID if (group.GetFromAssetID() == UUID.Zero) -- cgit v1.1