ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 20:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

Browse Source
This commit is contained in:
Justin Clark-Casey (justincc)
2010-09-08 01:05:56 +01:00
parent f7b28dd321 0bebe94231
commit b8d14fcc4a
16 changed files with 224 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/Framework/Scenes/SceneGraph.cs
View File

@@ -1632,6 +1632,11 @@ namespace OpenSim.Region.Framework.Scenes
// Unlink all child parts from their groups
//
child.ParentGroup.DelinkFromGroup(child, true);
// These are not in affected groups and will not be
// handled further. Do the honors here.
child.ParentGroup.HasGroupChanged = true;
child.ParentGroup.ScheduleGroupForFullUpdate();
}
foreach (SceneObjectPart root in rootParts)

4
OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
View File

@@ -307,7 +307,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
public void TestDelinkPersistence()
{
TestHelper.InMethod();
// log4net.Config.XmlConfigurator.Configure();
//log4net.Config.XmlConfigurator.Configure();
TestScene scene = SceneSetupHelpers.SetupScene();
@@ -342,4 +342,4 @@ namespace OpenSim.Region.Framework.Scenes.Tests
Assert.That(storedObjects[0].Children.ContainsKey(rootPartUuid));
}
}
}
}

4
OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
View File

@@ -75,7 +75,9 @@ namespace OpenSim.Region.Framework.Tests
protected TaskInventoryItem CreateSOItem1(Scene scene, SceneObjectPart part)
{
AssetNotecard nc = new AssetNotecard("Hello World!");
AssetNotecard nc = new AssetNotecard();
nc.BodyText = "Hello World!";
nc.Encode();
UUID ncAssetUuid = new UUID("00000000-0000-0000-1000-000000000000");
UUID ncItemUuid = new UUID("00000000-0000-0000-1100-000000000000");
AssetBase ncAsset