diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 12 |
2 files changed, 0 insertions, 14 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs index c1ba8a8..5dcbd28 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | |||
@@ -407,7 +407,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
407 | Assert.That(actualSceneBAtt.Name, Is.EqualTo(attItem.Name)); | 407 | Assert.That(actualSceneBAtt.Name, Is.EqualTo(attItem.Name)); |
408 | Assert.That(actualSceneBAtt.AttachmentPoint, Is.EqualTo((uint)AttachmentPoint.Chest)); | 408 | Assert.That(actualSceneBAtt.AttachmentPoint, Is.EqualTo((uint)AttachmentPoint.Chest)); |
409 | 409 | ||
410 | // Teleporting attachments should not end up in the scene graph | ||
411 | Assert.That(sceneB.GetSceneObjectGroups().Count, Is.EqualTo(1)); | 410 | Assert.That(sceneB.GetSceneObjectGroups().Count, Is.EqualTo(1)); |
412 | 411 | ||
413 | // Check attachments have been removed from sceneA | 412 | // Check attachments have been removed from sceneA |
@@ -422,7 +421,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
422 | List<SceneObjectGroup> actualSceneAAttachments = afterTeleportSceneASp.GetAttachments(); | 421 | List<SceneObjectGroup> actualSceneAAttachments = afterTeleportSceneASp.GetAttachments(); |
423 | Assert.That(actualSceneAAttachments.Count, Is.EqualTo(0)); | 422 | Assert.That(actualSceneAAttachments.Count, Is.EqualTo(0)); |
424 | 423 | ||
425 | // Teleporting attachments should not end up in the scene graph | ||
426 | Assert.That(sceneA.GetSceneObjectGroups().Count, Is.EqualTo(0)); | 424 | Assert.That(sceneA.GetSceneObjectGroups().Count, Is.EqualTo(0)); |
427 | } | 425 | } |
428 | 426 | ||
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index d98c01d..5c7bca0 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2600,18 +2600,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2600 | else | 2600 | else |
2601 | { | 2601 | { |
2602 | AddRestoredSceneObject(sceneObject, true, false); | 2602 | AddRestoredSceneObject(sceneObject, true, false); |
2603 | |||
2604 | if (!Permissions.CanObjectEntry(sceneObject.UUID, | ||
2605 | true, sceneObject.AbsolutePosition)) | ||
2606 | { | ||
2607 | // Deny non attachments based on parcel settings | ||
2608 | // | ||
2609 | m_log.Info("[INTERREGION]: Denied prim crossing because of parcel settings"); | ||
2610 | |||
2611 | DeleteSceneObject(sceneObject, false); | ||
2612 | |||
2613 | return false; | ||
2614 | } | ||
2615 | } | 2603 | } |
2616 | 2604 | ||
2617 | return true; | 2605 | return true; |