diff options
author | Justin Clarke Casey | 2008-11-06 23:40:58 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-06 23:40:58 +0000 |
commit | eec8c6cd6ebb5c50d274f3ccdde9cb7fcbd7f614 (patch) | |
tree | ec81acddf1f05b3abae7b994436526117ee6ea68 /OpenSim/Region/Environment/Scenes | |
parent | * Fix test failure in CSCodeGeneratorTest.TestJumps() (diff) | |
download | opensim-SC-eec8c6cd6ebb5c50d274f3ccdde9cb7fcbd7f614.zip opensim-SC-eec8c6cd6ebb5c50d274f3ccdde9cb7fcbd7f614.tar.gz opensim-SC-eec8c6cd6ebb5c50d274f3ccdde9cb7fcbd7f614.tar.bz2 opensim-SC-eec8c6cd6ebb5c50d274f3ccdde9cb7fcbd7f614.tar.xz |
* Remove SceneObjectPart.AttachToScene() since the remaining instruction can be done by other means
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 9 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 9 |
2 files changed, 2 insertions, 16 deletions
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 | |||
571 | public void AttachToScene(Scene scene) | 571 | public void AttachToScene(Scene scene) |
572 | { | 572 | { |
573 | m_scene = scene; | 573 | m_scene = scene; |
574 | RegionHandle = scene.RegionInfo.RegionHandle; | ||
574 | 575 | ||
575 | ApplyPhysics(m_scene.m_physicalPrim); | 576 | ApplyPhysics(m_scene.m_physicalPrim); |
576 | 577 | ||
577 | lock (m_parts) | ||
578 | { | ||
579 | foreach (SceneObjectPart part in m_parts.Values) | ||
580 | { | ||
581 | part.AttachToScene(scene.RegionInfo.RegionHandle); | ||
582 | } | ||
583 | } | ||
584 | |||
585 | // one of these is a proxy. | 578 | // one of these is a proxy. |
586 | if (m_rootPart.Shape.PCode != (byte)PCode.None && m_rootPart.Shape.PCode != (byte)PCode.ParticleSystem) | 579 | if (m_rootPart.Shape.PCode != (byte)PCode.None && m_rootPart.Shape.PCode != (byte)PCode.ParticleSystem) |
587 | AttachToBackup(); | 580 | 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) { | |||
3399 | } | 3399 | } |
3400 | 3400 | ||
3401 | #endregion Public Methods | 3401 | #endregion Public Methods |
3402 | 3402 | ||
3403 | /// <summary> | ||
3404 | /// Attach this part to a scene such that it appears to avatars | ||
3405 | /// </summary> | ||
3406 | protected internal void AttachToScene(ulong regionHandle) | ||
3407 | { | ||
3408 | m_regionHandle = regionHandle; | ||
3409 | } | ||
3410 | 3403 | ||
3411 | private byte GetAttachPointEncoded() | 3404 | private byte GetAttachPointEncoded() |
3412 | { | 3405 | { |