From dbec5e98595cfe87d26ef74703433db7956ab66d Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 3 Apr 2012 23:22:47 +0200
Subject: Fix more merge artefacts

---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 5c28d89..9cd438c 100644
--- 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)
-- 
cgit v1.1