aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/InnerScene.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/InnerScene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 6695dbf..b98f2d6 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -380,7 +380,7 @@ namespace OpenSim.Region.Environment.Scenes
380 SceneObjectGroup group = (SceneObjectGroup)obj; 380 SceneObjectGroup group = (SceneObjectGroup)obj;
381 381
382 //group.DetachToGround(); 382 //group.DetachToGround();
383 DetachSingleAttachmentToInv(group.GetFromAssetID(),remoteClient); 383 m_parentScene.DetachSingleAttachmentToInv(group.GetFromAssetID(),remoteClient);
384 } 384 }
385 } 385 }
386 } 386 }
@@ -432,7 +432,7 @@ namespace OpenSim.Region.Environment.Scenes
432 AttachObject(remoteClient, objectLocalID, AttachmentPt, rot, LLVector3.Zero); 432 AttachObject(remoteClient, objectLocalID, AttachmentPt, rot, LLVector3.Zero);
433 } 433 }
434 434
435 protected internal void RezSingleAttachment( 435 public SceneObjectGroup RezSingleAttachment(
436 IClientAPI remoteClient, LLUUID itemID, uint AttachmentPt,uint ItemFlags, uint NextOwnerMask) 436 IClientAPI remoteClient, LLUUID itemID, uint AttachmentPt,uint ItemFlags, uint NextOwnerMask)
437 { 437 {
438 SceneObjectGroup objatt = m_parentScene.RezObject(remoteClient, itemID, LLVector3.Zero, LLVector3.Zero, LLUUID.Zero, (byte)1, true, 438 SceneObjectGroup objatt = m_parentScene.RezObject(remoteClient, itemID, LLVector3.Zero, LLVector3.Zero, LLUUID.Zero, (byte)1, true,
@@ -446,11 +446,12 @@ namespace OpenSim.Region.Environment.Scenes
446 AttachObject(remoteClient,objatt.LocalId,AttachmentPt,new LLQuaternion(0,0,0,1),objatt.AbsolutePosition); 446 AttachObject(remoteClient,objatt.LocalId,AttachmentPt,new LLQuaternion(0,0,0,1),objatt.AbsolutePosition);
447 objatt.ScheduleGroupForFullUpdate(); 447 objatt.ScheduleGroupForFullUpdate();
448 } 448 }
449 return objatt;
449 } 450 }
450 451
451 // What makes this method odd and unique is it tries to detach using an LLUUID.... Yay for standards. 452 // What makes this method odd and unique is it tries to detach using an LLUUID.... Yay for standards.
452 // To LocalId or LLUUID, *THAT* is the question. How now Brown LLUUID?? 453 // To LocalId or LLUUID, *THAT* is the question. How now Brown LLUUID??
453 protected internal void DetachSingleAttachmentToInv(LLUUID itemID, IClientAPI remoteClient) 454 public void DetachSingleAttachmentToInv(LLUUID itemID, IClientAPI remoteClient)
454 { 455 {
455 if (itemID == LLUUID.Zero) // If this happened, someone made a mistake.... 456 if (itemID == LLUUID.Zero) // If this happened, someone made a mistake....
456 return; 457 return;