diff options
author | MW | 2007-08-03 16:17:05 +0000 |
---|---|---|
committer | MW | 2007-08-03 16:17:05 +0000 |
commit | 0975ff6cfd90209e9a6e622eaae1fb151f026853 (patch) | |
tree | 71e028779e78d6bb919db7940da473b8e394f5ec | |
parent | Yet another commit related to the SceneObject rewrites. (diff) | |
download | opensim-SC-0975ff6cfd90209e9a6e622eaae1fb151f026853.zip opensim-SC-0975ff6cfd90209e9a6e622eaae1fb151f026853.tar.gz opensim-SC-0975ff6cfd90209e9a6e622eaae1fb151f026853.tar.bz2 opensim-SC-0975ff6cfd90209e9a6e622eaae1fb151f026853.tar.xz |
Yet another commit related to the SceneObject rewrites.
-rw-r--r-- | OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs | 13 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs | 4 |
2 files changed, 12 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs index 22aadf4..d3b69b4 100644 --- a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs +++ b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs | |||
@@ -55,6 +55,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
55 | /// <summary> | 55 | /// <summary> |
56 | /// | 56 | /// |
57 | /// </summary> | 57 | /// </summary> |
58 | public AllNewSceneObjectGroup2(byte[] data) | ||
59 | { | ||
60 | |||
61 | } | ||
62 | |||
63 | /// <summary> | ||
64 | /// | ||
65 | /// </summary> | ||
58 | public AllNewSceneObjectGroup2(Scene world, ulong regionHandle, LLUUID ownerID, uint localID, LLVector3 pos, PrimitiveBaseShape shape) | 66 | public AllNewSceneObjectGroup2(Scene world, ulong regionHandle, LLUUID ownerID, uint localID, LLVector3 pos, PrimitiveBaseShape shape) |
59 | { | 67 | { |
60 | m_regionHandle = regionHandle; | 68 | m_regionHandle = regionHandle; |
@@ -67,6 +75,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
67 | this.SetPartAsRoot(newPart); | 75 | this.SetPartAsRoot(newPart); |
68 | } | 76 | } |
69 | 77 | ||
78 | |||
70 | #region Copying | 79 | #region Copying |
71 | /// <summary> | 80 | /// <summary> |
72 | /// | 81 | /// |
@@ -102,7 +111,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
102 | { | 111 | { |
103 | AllNewSceneObjectPart2 newPart = part.Copy(m_scene); | 112 | AllNewSceneObjectPart2 newPart = part.Copy(m_scene); |
104 | this.m_parts.Add(newPart.UUID, newPart); | 113 | this.m_parts.Add(newPart.UUID, newPart); |
105 | newPart.ParentID = this.m_rootPart.LocalID; | 114 | this.SetPartAsNonRoot(newPart); |
106 | } | 115 | } |
107 | #endregion | 116 | #endregion |
108 | 117 | ||
@@ -499,7 +508,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
499 | /// <param name="part"></param> | 508 | /// <param name="part"></param> |
500 | private void SetPartAsNonRoot(AllNewSceneObjectPart2 part) | 509 | private void SetPartAsNonRoot(AllNewSceneObjectPart2 part) |
501 | { | 510 | { |
502 | 511 | part.ParentID = this.m_rootPart.LocalID; | |
503 | } | 512 | } |
504 | 513 | ||
505 | /// <summary> | 514 | /// <summary> |
diff --git a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs index 813f2e1..93f2d0a 100644 --- a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs +++ b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs | |||
@@ -296,7 +296,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
296 | } | 296 | } |
297 | 297 | ||
298 | /// <summary> | 298 | /// <summary> |
299 | /// Recreate a SceneObjectPart (prim) | 299 | /// Re/create a SceneObjectPart (prim) |
300 | /// </summary> | 300 | /// </summary> |
301 | /// <param name="regionHandle"></param> | 301 | /// <param name="regionHandle"></param> |
302 | /// <param name="parent"></param> | 302 | /// <param name="parent"></param> |
@@ -553,8 +553,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
553 | 553 | ||
554 | remoteClient.SendPrimTerseUpdate(m_regionHandle, 64096, LocalID, lPos, mRot); | 554 | remoteClient.SendPrimTerseUpdate(m_regionHandle, 64096, LocalID, lPos, mRot); |
555 | } | 555 | } |
556 | |||
557 | |||
558 | #endregion | 556 | #endregion |
559 | } | 557 | } |
560 | } | 558 | } |