diff options
author | Justin Clarke Casey | 2008-11-07 19:30:20 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-07 19:30:20 +0000 |
commit | f3edbcfa3b0cea2c8d9e09dbbd0152b0eeca8565 (patch) | |
tree | ee7c56051701d4876f632c7ee60eb459ffdb47de /OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |
parent | * Remove more UpdateParentIDs() calls that are now duplicates (diff) | |
download | opensim-SC_OLD-f3edbcfa3b0cea2c8d9e09dbbd0152b0eeca8565.zip opensim-SC_OLD-f3edbcfa3b0cea2c8d9e09dbbd0152b0eeca8565.tar.gz opensim-SC_OLD-f3edbcfa3b0cea2c8d9e09dbbd0152b0eeca8565.tar.bz2 opensim-SC_OLD-f3edbcfa3b0cea2c8d9e09dbbd0152b0eeca8565.tar.xz |
* Stop prim attach being signalled twice (it is already been done outside AttachToScene())
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 27a3d8a..4c93a88 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -563,7 +563,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
563 | } | 563 | } |
564 | 564 | ||
565 | /// <summary> | 565 | /// <summary> |
566 | /// Attach the given group to a scene. It will appear to agents. | 566 | /// Attach this object to a scene. It will also now appear to agents. |
567 | /// </summary> | 567 | /// </summary> |
568 | /// <param name="scene"></param> | 568 | /// <param name="scene"></param> |
569 | public void AttachToScene(Scene scene) | 569 | public void AttachToScene(Scene scene) |
@@ -587,10 +587,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
587 | 587 | ||
588 | ApplyPhysics(m_scene.m_physicalPrim); | 588 | ApplyPhysics(m_scene.m_physicalPrim); |
589 | 589 | ||
590 | // one of these is a proxy. | ||
591 | if (m_rootPart.Shape.PCode != (byte)PCode.None && m_rootPart.Shape.PCode != (byte)PCode.ParticleSystem) | ||
592 | AttachToBackup(); | ||
593 | |||
594 | ScheduleGroupForFullUpdate(); | 590 | ScheduleGroupForFullUpdate(); |
595 | } | 591 | } |
596 | 592 | ||