aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-08-06 00:22:14 +0100
committerJustin Clark-Casey (justincc)2011-08-06 00:22:14 +0100
commitcba40de109a0ab54a58324f105cbba799da70e39 (patch)
tree69c1c761c05dac7f7ca9f65ba96cd6d0d7b6f0f7 /OpenSim/Region
parentrefactor: Fold most SOP.ScriptSet* methods back into script code. Simplify. (diff)
downloadopensim-SC_OLD-cba40de109a0ab54a58324f105cbba799da70e39.zip
opensim-SC_OLD-cba40de109a0ab54a58324f105cbba799da70e39.tar.gz
opensim-SC_OLD-cba40de109a0ab54a58324f105cbba799da70e39.tar.bz2
opensim-SC_OLD-cba40de109a0ab54a58324f105cbba799da70e39.tar.xz
extend phantom flag regression test to toggle back off
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs4
2 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index afc386e..7778ebc 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4514,6 +4514,9 @@ namespace OpenSim.Region.Framework.Scenes
4514 { 4514 {
4515 RemFlag(PrimFlags.Phantom); 4515 RemFlag(PrimFlags.Phantom);
4516 4516
4517 if (ParentGroup.Scene == null)
4518 return;
4519
4517 PhysicsActor pa = PhysActor; 4520 PhysicsActor pa = PhysActor;
4518 4521
4519 if (pa == null) 4522 if (pa == null)
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs
index 641c34e..c0fca5d 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs
@@ -57,6 +57,10 @@ namespace OpenSim.Region.Framework.Scenes.Tests
57 57
58// Console.WriteLine("so.RootPart.Flags [{0}]", so.RootPart.Flags); 58// Console.WriteLine("so.RootPart.Flags [{0}]", so.RootPart.Flags);
59 Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.Phantom)); 59 Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.Phantom));
60
61 so.ScriptSetPhantomStatus(false);
62
63 Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.None));
60 } 64 }
61 } 65 }
62} \ No newline at end of file 66} \ No newline at end of file