aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs (renamed from OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs)23
1 files changed, 15 insertions, 8 deletions
diff --git a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index c91701a..d0730d7 100644
--- a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -10,7 +10,7 @@ using OpenSim.Framework.Types;
10namespace OpenSim.Region.Environment.Scenes 10namespace OpenSim.Region.Environment.Scenes
11{ 11{
12 12
13 public class AllNewSceneObjectPart2 13 public class SceneObjectPart
14 { 14 {
15 private const uint FULL_MASK_PERMISSIONS = 2147483647; 15 private const uint FULL_MASK_PERMISSIONS = 2147483647;
16 16
@@ -29,7 +29,7 @@ namespace OpenSim.Region.Environment.Scenes
29 29
30 protected byte[] m_particleSystem = new byte[0]; 30 protected byte[] m_particleSystem = new byte[0];
31 31
32 protected AllNewSceneObjectGroup2 m_parentGroup; 32 protected SceneObjectGroup m_parentGroup;
33 33
34 /// <summary> 34 /// <summary>
35 /// Only used internally to schedule client updates 35 /// Only used internally to schedule client updates
@@ -42,7 +42,7 @@ namespace OpenSim.Region.Environment.Scenes
42 public LLUUID UUID 42 public LLUUID UUID
43 { 43 {
44 get { return m_uuid; } 44 get { return m_uuid; }
45 set { value = m_uuid; } 45 set { m_uuid = value ; }
46 } 46 }
47 47
48 protected uint m_localID; 48 protected uint m_localID;
@@ -176,7 +176,7 @@ namespace OpenSim.Region.Environment.Scenes
176 /// <summary> 176 /// <summary>
177 /// 177 ///
178 /// </summary> 178 /// </summary>
179 public AllNewSceneObjectPart2() 179 public SceneObjectPart()
180 { 180 {
181 181
182 } 182 }
@@ -190,8 +190,9 @@ namespace OpenSim.Region.Environment.Scenes
190 /// <param name="localID"></param> 190 /// <param name="localID"></param>
191 /// <param name="shape"></param> 191 /// <param name="shape"></param>
192 /// <param name="position"></param> 192 /// <param name="position"></param>
193 public AllNewSceneObjectPart2(ulong regionHandle, AllNewSceneObjectGroup2 parent, LLUUID ownerID, uint localID, PrimitiveBaseShape shape, LLVector3 groupPosition, LLVector3 offsetPosition) 193 public SceneObjectPart(ulong regionHandle, SceneObjectGroup parent, LLUUID ownerID, uint localID, PrimitiveBaseShape shape, LLVector3 groupPosition, LLVector3 offsetPosition)
194 { 194 {
195 this.m_partName = "Primitive";
195 this.m_regionHandle = regionHandle; 196 this.m_regionHandle = regionHandle;
196 this.m_parentGroup = parent; 197 this.m_parentGroup = parent;
197 198
@@ -215,6 +216,7 @@ namespace OpenSim.Region.Environment.Scenes
215 { 216 {
216 217
217 } 218 }
219 ScheduleFullUpdate();
218 } 220 }
219 221
220 /// <summary> 222 /// <summary>
@@ -226,7 +228,7 @@ namespace OpenSim.Region.Environment.Scenes
226 /// <param name="localID"></param> 228 /// <param name="localID"></param>
227 /// <param name="shape"></param> 229 /// <param name="shape"></param>
228 /// <param name="position"></param> 230 /// <param name="position"></param>
229 public AllNewSceneObjectPart2(ulong regionHandle, AllNewSceneObjectGroup2 parent, int creationDate, LLUUID ownerID, LLUUID creatorID, LLUUID lastOwnerID, uint localID, PrimitiveBaseShape shape, LLVector3 position, LLQuaternion rotation, uint flags) 231 public SceneObjectPart(ulong regionHandle, SceneObjectGroup parent, int creationDate, LLUUID ownerID, LLUUID creatorID, LLUUID lastOwnerID, uint localID, PrimitiveBaseShape shape, LLVector3 position, LLQuaternion rotation, uint flags)
230 { 232 {
231 this.m_regionHandle = regionHandle; 233 this.m_regionHandle = regionHandle;
232 this.m_parentGroup = parent; 234 this.m_parentGroup = parent;
@@ -250,9 +252,9 @@ namespace OpenSim.Region.Environment.Scenes
250 /// 252 ///
251 /// </summary> 253 /// </summary>
252 /// <returns></returns> 254 /// <returns></returns>
253 public AllNewSceneObjectPart2 Copy(uint localID) 255 public SceneObjectPart Copy(uint localID)
254 { 256 {
255 AllNewSceneObjectPart2 dupe = (AllNewSceneObjectPart2)this.MemberwiseClone(); 257 SceneObjectPart dupe = (SceneObjectPart)this.MemberwiseClone();
256 dupe.m_shape = m_shape.Copy(); 258 dupe.m_shape = m_shape.Copy();
257 dupe.m_regionHandle = m_regionHandle; 259 dupe.m_regionHandle = m_regionHandle;
258 dupe.UUID = LLUUID.Random(); 260 dupe.UUID = LLUUID.Random();
@@ -343,6 +345,7 @@ namespace OpenSim.Region.Environment.Scenes
343 this.m_shape.PathTaperY = shapeBlock.PathTaperY; 345 this.m_shape.PathTaperY = shapeBlock.PathTaperY;
344 this.m_shape.PathTwist = shapeBlock.PathTwist; 346 this.m_shape.PathTwist = shapeBlock.PathTwist;
345 this.m_shape.PathTwistBegin = shapeBlock.PathTwistBegin; 347 this.m_shape.PathTwistBegin = shapeBlock.PathTwistBegin;
348 ScheduleFullUpdate();
346 } 349 }
347 #endregion 350 #endregion
348 351
@@ -384,6 +387,7 @@ namespace OpenSim.Region.Environment.Scenes
384 public void UpdateTextureEntry(byte[] textureEntry) 387 public void UpdateTextureEntry(byte[] textureEntry)
385 { 388 {
386 this.m_shape.TextureEntry = textureEntry; 389 this.m_shape.TextureEntry = textureEntry;
390 ScheduleFullUpdate();
387 } 391 }
388 #endregion 392 #endregion
389 393
@@ -403,6 +407,7 @@ namespace OpenSim.Region.Environment.Scenes
403 { 407 {
404 LLVector3 newPos = new LLVector3(pos.X, pos.Y, pos.Z); 408 LLVector3 newPos = new LLVector3(pos.X, pos.Y, pos.Z);
405 this.OffsetPosition = newPos; 409 this.OffsetPosition = newPos;
410 ScheduleTerseUpdate();
406 } 411 }
407 #endregion 412 #endregion
408 413
@@ -410,6 +415,7 @@ namespace OpenSim.Region.Environment.Scenes
410 public void UpdateRotation(LLQuaternion rot) 415 public void UpdateRotation(LLQuaternion rot)
411 { 416 {
412 this.RotationOffset = new LLQuaternion(rot.X, rot.Y, rot.Z, rot.W); 417 this.RotationOffset = new LLQuaternion(rot.X, rot.Y, rot.Z, rot.W);
418 ScheduleTerseUpdate();
413 } 419 }
414 #endregion 420 #endregion
415 421
@@ -421,6 +427,7 @@ namespace OpenSim.Region.Environment.Scenes
421 public void Resize(LLVector3 scale) 427 public void Resize(LLVector3 scale)
422 { 428 {
423 this.m_shape.Scale = scale; 429 this.m_shape.Scale = scale;
430 ScheduleFullUpdate();
424 } 431 }
425 #endregion 432 #endregion
426 433