aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs30
2 files changed, 25 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs
index 84e8120..5d94f22 100644
--- a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs
+++ b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Region.Environment.Scenes
64 64
65 this.Pos = pos; 65 this.Pos = pos;
66 LLVector3 rootOffset = new LLVector3(0, 0, 0); 66 LLVector3 rootOffset = new LLVector3(0, 0, 0);
67 AllNewSceneObjectPart2 newPart = new AllNewSceneObjectPart2(m_regionHandle, this, ownerID, localID, shape, rootOffset); 67 AllNewSceneObjectPart2 newPart = new AllNewSceneObjectPart2(m_regionHandle, this, ownerID, localID, shape, pos, rootOffset);
68 this.m_parts.Add(newPart.UUID, newPart); 68 this.m_parts.Add(newPart.UUID, newPart);
69 this.SetPartAsRoot(newPart); 69 this.SetPartAsRoot(newPart);
70 } 70 }
@@ -293,7 +293,7 @@ namespace OpenSim.Region.Environment.Scenes
293 proper.ObjectData[0].TouchName = enc.GetBytes(this.m_rootPart.TouchName + "\0"); 293 proper.ObjectData[0].TouchName = enc.GetBytes(this.m_rootPart.TouchName + "\0");
294 proper.ObjectData[0].TextureID = new byte[0]; 294 proper.ObjectData[0].TextureID = new byte[0];
295 proper.ObjectData[0].SitName = enc.GetBytes(this.m_rootPart.SitName + "\0"); 295 proper.ObjectData[0].SitName = enc.GetBytes(this.m_rootPart.SitName + "\0");
296 proper.ObjectData[0].Name = enc.GetBytes(this.m_rootPart.Name + "\0"); 296 proper.ObjectData[0].Name = enc.GetBytes(this.m_rootPart.PartName + "\0");
297 proper.ObjectData[0].Description = enc.GetBytes(this.m_rootPart.Description + "\0"); 297 proper.ObjectData[0].Description = enc.GetBytes(this.m_rootPart.Description + "\0");
298 proper.ObjectData[0].OwnerMask = this.m_rootPart.OwnerMask; 298 proper.ObjectData[0].OwnerMask = this.m_rootPart.OwnerMask;
299 proper.ObjectData[0].NextOwnerMask = this.m_rootPart.NextOwnerMask; 299 proper.ObjectData[0].NextOwnerMask = this.m_rootPart.NextOwnerMask;
diff --git a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
index 542e13f..7a31369 100644
--- a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
+++ b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
@@ -26,7 +26,6 @@ namespace OpenSim.Region.Environment.Scenes
26 public uint GroupMask = FULL_MASK_PERMISSIONS; 26 public uint GroupMask = FULL_MASK_PERMISSIONS;
27 public uint EveryoneMask = FULL_MASK_PERMISSIONS; 27 public uint EveryoneMask = FULL_MASK_PERMISSIONS;
28 public uint BaseMask = FULL_MASK_PERMISSIONS; 28 public uint BaseMask = FULL_MASK_PERMISSIONS;
29
30 29
31 protected byte[] m_particleSystem = new byte[0]; 30 protected byte[] m_particleSystem = new byte[0];
32 31
@@ -53,11 +52,11 @@ namespace OpenSim.Region.Environment.Scenes
53 set { m_localID = value; } 52 set { m_localID = value; }
54 } 53 }
55 54
56 protected string m_name; 55 protected string m_partName;
57 public virtual string Name 56 public virtual string PartName
58 { 57 {
59 get { return m_name; } 58 get { return m_partName; }
60 set { m_name = value; } 59 set { m_partName = value; }
61 } 60 }
62 61
63 protected LLObject.ObjectFlags m_flags = (LLObject.ObjectFlags)32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456 + 128; 62 protected LLObject.ObjectFlags m_flags = (LLObject.ObjectFlags)32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456 + 128;
@@ -81,6 +80,14 @@ namespace OpenSim.Region.Environment.Scenes
81 set { m_regionHandle = value; } 80 set { m_regionHandle = value; }
82 } 81 }
83 82
83 //unkown if this will be kept, added as a way of removing the group position from the group class
84 protected LLVector3 m_groupPosition;
85 public LLVector3 GroupPosition
86 {
87 get { return m_groupPosition; }
88 set { m_groupPosition = value; }
89 }
90
84 protected LLVector3 m_offset; 91 protected LLVector3 m_offset;
85 public LLVector3 OffsetPosition 92 public LLVector3 OffsetPosition
86 { 93 {
@@ -165,6 +172,14 @@ namespace OpenSim.Region.Environment.Scenes
165 } 172 }
166 #endregion 173 #endregion
167 174
175 //might not end up being used
176 protected bool m_isRoot;
177 public bool IsRoot
178 {
179 set { m_isRoot = value; }
180 get { return this.m_isRoot; }
181 }
182
168 #region Constructors 183 #region Constructors
169 /// <summary> 184 /// <summary>
170 /// 185 ///
@@ -183,7 +198,7 @@ namespace OpenSim.Region.Environment.Scenes
183 /// <param name="localID"></param> 198 /// <param name="localID"></param>
184 /// <param name="shape"></param> 199 /// <param name="shape"></param>
185 /// <param name="position"></param> 200 /// <param name="position"></param>
186 public AllNewSceneObjectPart2(ulong regionHandle, AllNewSceneObjectGroup2 parent, LLUUID ownerID, uint localID, PrimitiveBaseShape shape, LLVector3 position) 201 public AllNewSceneObjectPart2(ulong regionHandle, AllNewSceneObjectGroup2 parent, LLUUID ownerID, uint localID, PrimitiveBaseShape shape, LLVector3 groupPosition, LLVector3 offsetPosition)
187 { 202 {
188 this.m_regionHandle = regionHandle; 203 this.m_regionHandle = regionHandle;
189 this.m_parentGroup = parent; 204 this.m_parentGroup = parent;
@@ -196,7 +211,8 @@ namespace OpenSim.Region.Environment.Scenes
196 this.LocalID = (uint)(localID); 211 this.LocalID = (uint)(localID);
197 this.m_shape = shape; 212 this.m_shape = shape;
198 213
199 this.OffsetPosition = position; 214 this.m_groupPosition = groupPosition;
215 this.OffsetPosition = offsetPosition;
200 this.RotationOffset = LLQuaternion.Identity; 216 this.RotationOffset = LLQuaternion.Identity;
201 this.Velocity = new LLVector3(0, 0, 0); 217 this.Velocity = new LLVector3(0, 0, 0);
202 this.AngularVelocity = new LLVector3(0, 0, 0); 218 this.AngularVelocity = new LLVector3(0, 0, 0);