From d43f739cef2c31200ab297d596b073da29972118 Mon Sep 17 00:00:00 2001
From: Kitto Flora
Date: Wed, 30 Sep 2009 19:05:39 +0200
Subject: And another merge issue

---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index d983b75..9819163 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3485,6 +3485,7 @@ if (m_shape != null) {
             else
             {   // 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 :-))
+                PhysicsActor pa = this.PhysActor;
                 if (pa != null)
                 {
                     PhysActor.SetVolumeDetect(0);
-- 
cgit v1.1