OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

extend phantom flag regression test to toggle back off

bulletsim
Justin Clark-Casey (justincc) 2011-08-06 00:22:14 +01:00
parent c6c91e6599
commit cba40de109
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -4514,6 +4514,9 @@ namespace OpenSim.Region.Framework.Scenes
{ {
RemFlag(PrimFlags.Phantom); RemFlag(PrimFlags.Phantom);
if (ParentGroup.Scene == null)
return;
PhysicsActor pa = PhysActor; PhysicsActor pa = PhysActor;
if (pa == null) if (pa == null)

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

@ -57,6 +57,10 @@ namespace OpenSim.Region.Framework.Scenes.Tests
// Console.WriteLine("so.RootPart.Flags [{0}]", so.RootPart.Flags); // Console.WriteLine("so.RootPart.Flags [{0}]", so.RootPart.Flags);
Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.Phantom)); Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.Phantom));
so.ScriptSetPhantomStatus(false);
Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.None));
} }
} }
} }