diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs index a4b3852..f932b70 100644 --- a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs +++ b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs | |||
@@ -23,7 +23,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
23 | /// <summary> | 23 | /// <summary> |
24 | /// | 24 | /// |
25 | /// </summary> | 25 | /// </summary> |
26 | public int primCount | 26 | public int PrimCount |
27 | { | 27 | { |
28 | get | 28 | get |
29 | { | 29 | { |
@@ -99,7 +99,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
99 | { | 99 | { |
100 | foreach (AllNewSceneObjectPart2 part in this.m_parts.Values) | 100 | foreach (AllNewSceneObjectPart2 part in this.m_parts.Values) |
101 | { | 101 | { |
102 | if (part.m_localID == localID) | 102 | if (part.LocalID == localID) |
103 | { | 103 | { |
104 | return part; | 104 | return part; |
105 | } | 105 | } |
@@ -185,7 +185,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
185 | AllNewSceneObjectPart2 part = this.GetChildPrim(localID); | 185 | AllNewSceneObjectPart2 part = this.GetChildPrim(localID); |
186 | if (part != null) | 186 | if (part != null) |
187 | { | 187 | { |
188 | if (part.uuid == this.m_rootPart.uuid) | 188 | if (part.UUID == this.m_rootPart.UUID) |
189 | { | 189 | { |
190 | this.UpdateRootPosition(pos); | 190 | this.UpdateRootPosition(pos); |
191 | } | 191 | } |
@@ -210,7 +210,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
210 | 210 | ||
211 | foreach (AllNewSceneObjectPart2 obPart in this.m_parts.Values) | 211 | foreach (AllNewSceneObjectPart2 obPart in this.m_parts.Values) |
212 | { | 212 | { |
213 | if (obPart.uuid != this.m_rootPart.uuid) | 213 | if (obPart.UUID != this.m_rootPart.UUID) |
214 | { | 214 | { |
215 | obPart.OffsetPosition = obPart.OffsetPosition + diff; | 215 | obPart.OffsetPosition = obPart.OffsetPosition + diff; |
216 | } | 216 | } |
@@ -244,7 +244,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
244 | AllNewSceneObjectPart2 part = this.GetChildPrim(localID); | 244 | AllNewSceneObjectPart2 part = this.GetChildPrim(localID); |
245 | if (part != null) | 245 | if (part != null) |
246 | { | 246 | { |
247 | if (part.uuid == this.m_rootPart.uuid) | 247 | if (part.UUID == this.m_rootPart.UUID) |
248 | { | 248 | { |
249 | this.UpdateRootRotation(rot); | 249 | this.UpdateRootRotation(rot); |
250 | } | 250 | } |
@@ -262,7 +262,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
262 | 262 | ||
263 | foreach (AllNewSceneObjectPart2 prim in this.m_parts.Values) | 263 | foreach (AllNewSceneObjectPart2 prim in this.m_parts.Values) |
264 | { | 264 | { |
265 | if (prim.uuid != this.m_rootPart.uuid) | 265 | if (prim.UUID != this.m_rootPart.UUID) |
266 | { | 266 | { |
267 | Vector3 axPos = new Vector3(prim.OffsetPosition.X, prim.OffsetPosition.Y, prim.OffsetPosition.Z); | 267 | Vector3 axPos = new Vector3(prim.OffsetPosition.X, prim.OffsetPosition.Y, prim.OffsetPosition.Z); |
268 | axPos = oldParentRot * axPos; | 268 | axPos = oldParentRot * axPos; |
@@ -283,8 +283,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
283 | private void SetPartAsRoot(AllNewSceneObjectPart2 part) | 283 | private void SetPartAsRoot(AllNewSceneObjectPart2 part) |
284 | { | 284 | { |
285 | this.m_rootPart = part; | 285 | this.m_rootPart = part; |
286 | this.m_uuid = part.uuid; | 286 | this.m_uuid = part.UUID; |
287 | this.m_localId = part.m_localID; | 287 | this.m_localId = part.LocalID; |
288 | } | 288 | } |
289 | 289 | ||
290 | /// <summary> | 290 | /// <summary> |