diff options
| author | Justin Clark-Casey (justincc) | 2011-08-06 00:22:14 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-08-06 00:22:14 +0100 |
| commit | cba40de109a0ab54a58324f105cbba799da70e39 (patch) | |
| tree | 69c1c761c05dac7f7ca9f65ba96cd6d0d7b6f0f7 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
| parent | refactor: Fold most SOP.ScriptSet* methods back into script code. Simplify. (diff) | |
| download | opensim-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/Framework/Scenes/SceneObjectPart.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 3 |
1 files changed, 3 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) |