From eec8c6cd6ebb5c50d274f3ccdde9cb7fcbd7f614 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Thu, 6 Nov 2008 23:40:58 +0000
Subject: * Remove SceneObjectPart.AttachToScene() since the remaining
 instruction can be done by other means

---
 OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 9 +--------
 OpenSim/Region/Environment/Scenes/SceneObjectPart.cs  | 9 +--------
 2 files changed, 2 insertions(+), 16 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 9fd4728..2f25478 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -571,17 +571,10 @@ namespace OpenSim.Region.Environment.Scenes
         public void AttachToScene(Scene scene)
         {
             m_scene = scene;
+            RegionHandle = scene.RegionInfo.RegionHandle;
             
             ApplyPhysics(m_scene.m_physicalPrim);            
             
-            lock (m_parts)
-            {
-                foreach (SceneObjectPart part in m_parts.Values)
-                {
-                    part.AttachToScene(scene.RegionInfo.RegionHandle);
-                }
-            }
-            
             // one of these is a proxy.
             if (m_rootPart.Shape.PCode != (byte)PCode.None && m_rootPart.Shape.PCode != (byte)PCode.ParticleSystem)
                 AttachToBackup();
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 3ddc0ed..d746ec4 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -3399,14 +3399,7 @@ if (m_shape != null) {
         }        
 
         #endregion Public Methods
-        
-        /// <summary>
-        /// Attach this part to a scene such that it appears to avatars
-        /// </summary>
-        protected internal void AttachToScene(ulong regionHandle)
-        {
-            m_regionHandle = regionHandle;
-        }
+
 
         private byte GetAttachPointEncoded()
         {
-- 
cgit v1.1