From 585f1b189fa6248c0620963d9c39d50a6a33e11e Mon Sep 17 00:00:00 2001
From: Melanie <melanie@t-data.com>
Date: Tue, 25 Oct 2011 02:08:43 +0100
Subject: [PATCH] Merge

---
 OpenSim/Region/Framework/Scenes/Scene.cs            | 2 --
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 4d8a759c12..c76538f91b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -577,8 +577,6 @@ namespace OpenSim.Region.Framework.Scenes
             m_lastIncoming = 0;
             m_lastOutgoing = 0;
 
-            m_physicalPrim = physicalPrim;
-            
             m_seeIntoRegionFromNeighbor = SeeIntoRegionFromNeighbor;
 
             m_asyncSceneObjectDeleter = new AsyncSceneObjectGroupDeleter(this);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 2507c67b6b..fae161857f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1267,7 +1267,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             m_rootPart.SetParentLocalId(0);
             AttachmentPoint = (byte)0;
-            m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive, m_scene.m_physicalPrim);
+            m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive);
             HasGroupChanged = true;
             RootPart.Rezzed = DateTime.Now;
             RootPart.RemFlag(PrimFlags.TemporaryOnRez);