aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs2
2 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 4d8a759..c76538f 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -577,8 +577,6 @@ namespace OpenSim.Region.Framework.Scenes
577 m_lastIncoming = 0; 577 m_lastIncoming = 0;
578 m_lastOutgoing = 0; 578 m_lastOutgoing = 0;
579 579
580 m_physicalPrim = physicalPrim;
581
582 m_seeIntoRegionFromNeighbor = SeeIntoRegionFromNeighbor; 580 m_seeIntoRegionFromNeighbor = SeeIntoRegionFromNeighbor;
583 581
584 m_asyncSceneObjectDeleter = new AsyncSceneObjectGroupDeleter(this); 582 m_asyncSceneObjectDeleter = new AsyncSceneObjectGroupDeleter(this);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 2507c67..fae1618 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1267,7 +1267,7 @@ namespace OpenSim.Region.Framework.Scenes
1267 1267
1268 m_rootPart.SetParentLocalId(0); 1268 m_rootPart.SetParentLocalId(0);
1269 AttachmentPoint = (byte)0; 1269 AttachmentPoint = (byte)0;
1270 m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive, m_scene.m_physicalPrim); 1270 m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive);
1271 HasGroupChanged = true; 1271 HasGroupChanged = true;
1272 RootPart.Rezzed = DateTime.Now; 1272 RootPart.Rezzed = DateTime.Now;
1273 RootPart.RemFlag(PrimFlags.TemporaryOnRez); 1273 RootPart.RemFlag(PrimFlags.TemporaryOnRez);