Fix more merge artefacts

2012-04-03 23:22:47 +02:00 · 2012-04-03 23:22:47 +02:00 · dbec5e9859
parent 7154d480b9
commit dbec5e9859
1 changed files with 3 additions and 3 deletions
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@ -4837,11 +4837,11 @@ namespace OpenSim.Region.Framework.Scenes
            {
                // Remove VolumeDetect in any case. Note, it's safe to call SetVolumeDetect as often as you like
                // (mumbles, well, at least if you have infinte CPU powers :-))
-                if (this.PhysActor != null)
+                if (pa != null)
                {
                    PhysActor.SetVolumeDetect(0);
-
-                this.VolumeDetectActive = false;
+                    this.VolumeDetectActive = false;
+                }
            }

            if (SetTemporary)