diff options
author | Justin Clarke Casey | 2008-11-07 19:49:22 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-07 19:49:22 +0000 |
commit | af35f4cb4a97c4cbed17fcd5ac5c116cf0d0d462 (patch) | |
tree | d713313c475e50e0df7c08d66dc19907bd6c46d7 /OpenSim/Region/Environment | |
parent | * Stop prim attach being signalled twice (it is already been done outside Att... (diff) | |
download | opensim-SC-af35f4cb4a97c4cbed17fcd5ac5c116cf0d0d462.zip opensim-SC-af35f4cb4a97c4cbed17fcd5ac5c116cf0d0d462.tar.gz opensim-SC-af35f4cb4a97c4cbed17fcd5ac5c116cf0d0d462.tar.bz2 opensim-SC-af35f4cb4a97c4cbed17fcd5ac5c116cf0d0d462.tar.xz |
* refactor: stop unnecessary passing of scene to sog copy constructor
* this is now done in AttachToScene()
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 4c93a88..dec8bf4 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -363,10 +363,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
363 | /// The original SceneObjectPart will be used rather than a copy, preserving | 363 | /// The original SceneObjectPart will be used rather than a copy, preserving |
364 | /// its existing localID and UUID. | 364 | /// its existing localID and UUID. |
365 | /// </summary> | 365 | /// </summary> |
366 | public SceneObjectGroup(Scene scene, ulong regionHandle, SceneObjectPart part) | 366 | public SceneObjectGroup(SceneObjectPart part) |
367 | { | 367 | { |
368 | m_scene = scene; | ||
369 | |||
370 | part.SetParent(this); | 368 | part.SetParent(this); |
371 | part.ParentID = 0; | 369 | part.ParentID = 0; |
372 | part.LinkNum = 0; | 370 | part.LinkNum = 0; |
@@ -374,8 +372,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
374 | m_parts.Add(part.UUID, part); | 372 | m_parts.Add(part.UUID, part); |
375 | 373 | ||
376 | SetPartAsRoot(part); | 374 | SetPartAsRoot(part); |
377 | |||
378 | RegionHandle = regionHandle; | ||
379 | } | 375 | } |
380 | 376 | ||
381 | /// <summary> | 377 | /// <summary> |
@@ -1982,7 +1978,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1982 | 1978 | ||
1983 | linkPart.RotationOffset = worldRot; | 1979 | linkPart.RotationOffset = worldRot; |
1984 | 1980 | ||
1985 | SceneObjectGroup objectGroup = new SceneObjectGroup(m_scene, m_regionHandle, linkPart); | 1981 | SceneObjectGroup objectGroup = new SceneObjectGroup(linkPart); |
1986 | 1982 | ||
1987 | m_scene.AddNewSceneObject(objectGroup, true); | 1983 | m_scene.AddNewSceneObject(objectGroup, true); |
1988 | 1984 | ||