diff options
Diffstat (limited to 'OpenSim/Region/Framework')
3 files changed, 10 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index e7175c5..dfb26b9 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -1632,6 +1632,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
1632 | // Unlink all child parts from their groups | 1632 | // Unlink all child parts from their groups |
1633 | // | 1633 | // |
1634 | child.ParentGroup.DelinkFromGroup(child, true); | 1634 | child.ParentGroup.DelinkFromGroup(child, true); |
1635 | |||
1636 | // These are not in affected groups and will not be | ||
1637 | // handled further. Do the honors here. | ||
1638 | child.ParentGroup.HasGroupChanged = true; | ||
1639 | child.ParentGroup.ScheduleGroupForFullUpdate(); | ||
1635 | } | 1640 | } |
1636 | 1641 | ||
1637 | foreach (SceneObjectPart root in rootParts) | 1642 | foreach (SceneObjectPart root in rootParts) |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs index 3c03ba0..e3ef263 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs | |||
@@ -307,7 +307,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
307 | public void TestDelinkPersistence() | 307 | public void TestDelinkPersistence() |
308 | { | 308 | { |
309 | TestHelper.InMethod(); | 309 | TestHelper.InMethod(); |
310 | // log4net.Config.XmlConfigurator.Configure(); | 310 | //log4net.Config.XmlConfigurator.Configure(); |
311 | 311 | ||
312 | TestScene scene = SceneSetupHelpers.SetupScene(); | 312 | TestScene scene = SceneSetupHelpers.SetupScene(); |
313 | 313 | ||
@@ -342,4 +342,4 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
342 | Assert.That(storedObjects[0].Children.ContainsKey(rootPartUuid)); | 342 | Assert.That(storedObjects[0].Children.ContainsKey(rootPartUuid)); |
343 | } | 343 | } |
344 | } | 344 | } |
345 | } \ No newline at end of file | 345 | } |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs index da8199d..5e491c2 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs | |||
@@ -75,7 +75,9 @@ namespace OpenSim.Region.Framework.Tests | |||
75 | 75 | ||
76 | protected TaskInventoryItem CreateSOItem1(Scene scene, SceneObjectPart part) | 76 | protected TaskInventoryItem CreateSOItem1(Scene scene, SceneObjectPart part) |
77 | { | 77 | { |
78 | AssetNotecard nc = new AssetNotecard("Hello World!"); | 78 | AssetNotecard nc = new AssetNotecard(); |
79 | nc.BodyText = "Hello World!"; | ||
80 | nc.Encode(); | ||
79 | UUID ncAssetUuid = new UUID("00000000-0000-0000-1000-000000000000"); | 81 | UUID ncAssetUuid = new UUID("00000000-0000-0000-1000-000000000000"); |
80 | UUID ncItemUuid = new UUID("00000000-0000-0000-1100-000000000000"); | 82 | UUID ncItemUuid = new UUID("00000000-0000-0000-1100-000000000000"); |
81 | AssetBase ncAsset | 83 | AssetBase ncAsset |