diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/InnerScene.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/InnerScene.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index 4e7494e..6c0f57b 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs | |||
@@ -433,7 +433,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
433 | /// <param name="objectLocalID"></param> | 433 | /// <param name="objectLocalID"></param> |
434 | /// <param name="AttachmentPt"></param> | 434 | /// <param name="AttachmentPt"></param> |
435 | /// <param name="rot"></param> | 435 | /// <param name="rot"></param> |
436 | protected internal void AttachObject(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot) | 436 | protected internal void AttachObject(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, bool silent) |
437 | { | 437 | { |
438 | // If we can't take it, we can't attach it! | 438 | // If we can't take it, we can't attach it! |
439 | // | 439 | // |
@@ -447,7 +447,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
447 | 447 | ||
448 | // Calls attach with a Zero position | 448 | // Calls attach with a Zero position |
449 | // | 449 | // |
450 | AttachObject(remoteClient, objectLocalID, AttachmentPt, rot, Vector3.Zero); | 450 | AttachObject(remoteClient, objectLocalID, AttachmentPt, rot, Vector3.Zero, false); |
451 | } | 451 | } |
452 | 452 | ||
453 | public SceneObjectGroup RezSingleAttachment( | 453 | public SceneObjectGroup RezSingleAttachment( |
@@ -464,7 +464,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
464 | if (AttachmentPt != 0 && AttachmentPt != objatt.GetAttachmentPoint()) | 464 | if (AttachmentPt != 0 && AttachmentPt != objatt.GetAttachmentPoint()) |
465 | tainted = true; | 465 | tainted = true; |
466 | 466 | ||
467 | AttachObject(remoteClient, objatt.LocalId, AttachmentPt, Quaternion.Identity, objatt.AbsolutePosition); | 467 | AttachObject(remoteClient, objatt.LocalId, AttachmentPt, Quaternion.Identity, objatt.AbsolutePosition, false); |
468 | objatt.ScheduleGroupForFullUpdate(); | 468 | objatt.ScheduleGroupForFullUpdate(); |
469 | if (tainted) | 469 | if (tainted) |
470 | objatt.HasGroupChanged = true; | 470 | objatt.HasGroupChanged = true; |
@@ -491,14 +491,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
491 | group.DetachToInventoryPrep(); | 491 | group.DetachToInventoryPrep(); |
492 | m_log.Debug("[DETACH]: Saving attachpoint: " + ((uint)group.GetAttachmentPoint()).ToString()); | 492 | m_log.Debug("[DETACH]: Saving attachpoint: " + ((uint)group.GetAttachmentPoint()).ToString()); |
493 | m_parentScene.updateKnownAsset(remoteClient, group, group.GetFromAssetID(), group.OwnerID); | 493 | m_parentScene.updateKnownAsset(remoteClient, group, group.GetFromAssetID(), group.OwnerID); |
494 | m_parentScene.DeleteSceneObject(group); | 494 | m_parentScene.DeleteSceneObject(group, false); |
495 | } | 495 | } |
496 | } | 496 | } |
497 | } | 497 | } |
498 | } | 498 | } |
499 | 499 | ||
500 | protected internal void AttachObject( | 500 | protected internal void AttachObject( |
501 | IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, Vector3 attachPos) | 501 | IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, Vector3 attachPos, bool silent) |
502 | { | 502 | { |
503 | List<EntityBase> EntityList = GetEntities(); | 503 | List<EntityBase> EntityList = GetEntities(); |
504 | foreach (EntityBase obj in EntityList) | 504 | foreach (EntityBase obj in EntityList) |
@@ -553,7 +553,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
553 | 553 | ||
554 | m_parentScene.AttachObject(remoteClient, AttachmentPt, itemId, group); | 554 | m_parentScene.AttachObject(remoteClient, AttachmentPt, itemId, group); |
555 | 555 | ||
556 | group.AttachToAgent(remoteClient.AgentId, AttachmentPt, attachPos); | 556 | group.AttachToAgent(remoteClient.AgentId, AttachmentPt, attachPos, silent); |
557 | // In case it is later dropped again, don't let | 557 | // In case it is later dropped again, don't let |
558 | // it get cleaned up | 558 | // it get cleaned up |
559 | // | 559 | // |