diff options
author | Justin Clarke Casey | 2008-06-17 20:36:21 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-06-17 20:36:21 +0000 |
commit | 16d0a895cb817f96a55091fadbbd4cfb2d909204 (patch) | |
tree | 30c2c790f64284dbce988554b0bb0c1ae3417307 /OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |
parent | * refactor: Remove largely duplicate code from SceneXmlLoader.CreatePrimFromX... (diff) | |
download | opensim-SC_OLD-16d0a895cb817f96a55091fadbbd4cfb2d909204.zip opensim-SC_OLD-16d0a895cb817f96a55091fadbbd4cfb2d909204.tar.gz opensim-SC_OLD-16d0a895cb817f96a55091fadbbd4cfb2d909204.tar.bz2 opensim-SC_OLD-16d0a895cb817f96a55091fadbbd4cfb2d909204.tar.xz |
* Refactor: Move the responsibility for applying physics and sending the initial client update to Scene.AddSceneObject() from some of the SceneObjectGroup constructors
* I think this has been done cleanly from inspection and testing, but if prim creation or load suddenly starts playing up more than usual, please open a mantis
* This also has the effect of stopping the archiver generating ghost in-world prims
* Some code dupliction also removed
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 877f196..f94830e 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -350,10 +350,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
350 | SetPartAsRoot(part); | 350 | SetPartAsRoot(part); |
351 | 351 | ||
352 | RegionHandle = regionHandle; | 352 | RegionHandle = regionHandle; |
353 | |||
354 | ApplyPhysics(scene.m_physicalPrim); | ||
355 | |||
356 | ScheduleGroupForFullUpdate(); | ||
357 | } | 353 | } |
358 | 354 | ||
359 | /// <summary> | 355 | /// <summary> |
@@ -412,10 +408,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
412 | m_rootPart.ParentID = 0; | 408 | m_rootPart.ParentID = 0; |
413 | m_rootPart.RegionHandle = m_regionHandle; | 409 | m_rootPart.RegionHandle = m_regionHandle; |
414 | UpdateParentIDs(); | 410 | UpdateParentIDs(); |
415 | |||
416 | ApplyPhysics(scene.m_physicalPrim); | ||
417 | |||
418 | ScheduleGroupForFullUpdate(); | ||
419 | } | 411 | } |
420 | 412 | ||
421 | /// <summary> | 413 | /// <summary> |
@@ -854,7 +846,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
854 | if (part.UUID != m_rootPart.UUID) | 846 | if (part.UUID != m_rootPart.UUID) |
855 | { | 847 | { |
856 | part.ParentID = m_rootPart.LocalId; | 848 | part.ParentID = m_rootPart.LocalId; |
857 | |||
858 | } | 849 | } |
859 | } | 850 | } |
860 | } | 851 | } |