And another merge issue

2009-09-30 19:05:39 +02:00 · 2009-09-30 19:05:39 +02:00 · d43f739cef
parent 11750a272e
commit d43f739cef
1 changed files with 1 additions and 0 deletions
--- 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);