aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/InnerScene.cs
diff options
context:
space:
mode:
authorMelanie Thielker2008-10-04 16:45:38 +0000
committerMelanie Thielker2008-10-04 16:45:38 +0000
commit52963c180e26977ccb034e5966e818c99278887f (patch)
tree53e65246dff270cd3bafcc414029f960d705e41b /OpenSim/Region/Environment/Scenes/InnerScene.cs
parentUnclutter rezzing methods by removing the ad hoc permissions parameters. (diff)
downloadopensim-SC_OLD-52963c180e26977ccb034e5966e818c99278887f.zip
opensim-SC_OLD-52963c180e26977ccb034e5966e818c99278887f.tar.gz
opensim-SC_OLD-52963c180e26977ccb034e5966e818c99278887f.tar.bz2
opensim-SC_OLD-52963c180e26977ccb034e5966e818c99278887f.tar.xz
Mantis #2330
Fixes use of the saved attachment point from asset
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/InnerScene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs9
1 files 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
454 public SceneObjectGroup RezSingleAttachment( 454 public SceneObjectGroup RezSingleAttachment(
455 IClientAPI remoteClient, UUID itemID, uint AttachmentPt) 455 IClientAPI remoteClient, UUID itemID, uint AttachmentPt)
456 { 456 {
457 SceneObjectGroup objatt = m_parentScene.RezObject(remoteClient, itemID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true, 457 SceneObjectGroup objatt = m_parentScene.RezObject(remoteClient,
458 itemID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true,
458 false, false, remoteClient.AgentId, true); 459 false, false, remoteClient.AgentId, true);
459 460
461
460 if (objatt != null) 462 if (objatt != null)
461 { 463 {
462 objatt.SetAttachmentPoint(Convert.ToByte(AttachmentPt));
463
464 AttachObject(remoteClient, objatt.LocalId, AttachmentPt, Quaternion.Identity, objatt.AbsolutePosition); 464 AttachObject(remoteClient, objatt.LocalId, AttachmentPt, Quaternion.Identity, objatt.AbsolutePosition);
465 objatt.ScheduleGroupForFullUpdate(); 465 objatt.ScheduleGroupForFullUpdate();
466 } 466 }
@@ -531,9 +531,8 @@ namespace OpenSim.Region.Environment.Scenes
531 AttachmentPt = (uint)AttachmentPoint.LeftHand; 531 AttachmentPt = (uint)AttachmentPoint.LeftHand;
532 attachPos = Vector3.Zero; 532 attachPos = Vector3.Zero;
533 } 533 }
534 m_log.Debug("[ATTACH]: Using attachpoint: " + AttachmentPt.ToString());
535
536 534
535 group.SetAttachmentPoint(Convert.ToByte(AttachmentPt));
537 536
538 // Saves and gets assetID 537 // Saves and gets assetID
539 if (group.GetFromAssetID() == UUID.Zero) 538 if (group.GetFromAssetID() == UUID.Zero)