aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs26
1 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 73f199e..a5ad2e6 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -76,7 +76,7 @@ namespace OpenSim.Region.Environment.Scenes
76 } 76 }
77 } 77 }
78 78
79 public override LLVector3 Pos 79 public override LLVector3 AbsolutePosition
80 { 80 {
81 get { return m_rootPart.GroupPosition; } 81 get { return m_rootPart.GroupPosition; }
82 set 82 set
@@ -248,7 +248,7 @@ namespace OpenSim.Region.Environment.Scenes
248 { 248 {
249 SceneObjectGroup dupe = (SceneObjectGroup)this.MemberwiseClone(); 249 SceneObjectGroup dupe = (SceneObjectGroup)this.MemberwiseClone();
250 dupe.m_parts.Clear(); 250 dupe.m_parts.Clear();
251 dupe.Pos = new LLVector3(Pos.X, Pos.Y, Pos.Z); 251 dupe.AbsolutePosition = new LLVector3(AbsolutePosition.X, AbsolutePosition.Y, AbsolutePosition.Z);
252 dupe.m_scene = m_scene; 252 dupe.m_scene = m_scene;
253 dupe.m_regionHandle = this.m_regionHandle; 253 dupe.m_regionHandle = this.m_regionHandle;
254 254
@@ -427,8 +427,8 @@ namespace OpenSim.Region.Environment.Scenes
427 public void LinkToGroup(SceneObjectGroup objectGroup) 427 public void LinkToGroup(SceneObjectGroup objectGroup)
428 { 428 {
429 SceneObjectPart linkPart = objectGroup.m_rootPart; 429 SceneObjectPart linkPart = objectGroup.m_rootPart;
430 linkPart.OffsetPosition = linkPart.GroupPosition - this.Pos; 430 linkPart.OffsetPosition = linkPart.GroupPosition - this.AbsolutePosition;
431 linkPart.GroupPosition = this.Pos; 431 linkPart.GroupPosition = this.AbsolutePosition;
432 432
433 Vector3 axPos = new Vector3(linkPart.OffsetPosition.X, linkPart.OffsetPosition.Y, linkPart.OffsetPosition.Z); 433 Vector3 axPos = new Vector3(linkPart.OffsetPosition.X, linkPart.OffsetPosition.Y, linkPart.OffsetPosition.Z);
434 Quaternion parentRot = new Quaternion(this.m_rootPart.RotationOffset.W, this.m_rootPart.RotationOffset.X, this.m_rootPart.RotationOffset.Y, this.m_rootPart.RotationOffset.Z); 434 Quaternion parentRot = new Quaternion(this.m_rootPart.RotationOffset.W, this.m_rootPart.RotationOffset.X, this.m_rootPart.RotationOffset.Y, this.m_rootPart.RotationOffset.Z);
@@ -456,7 +456,7 @@ namespace OpenSim.Region.Environment.Scenes
456 /// <param name="remoteClient"></param> 456 /// <param name="remoteClient"></param>
457 public void GrabMovement(LLVector3 offset, LLVector3 pos, IClientAPI remoteClient) 457 public void GrabMovement(LLVector3 offset, LLVector3 pos, IClientAPI remoteClient)
458 { 458 {
459 this.Pos = pos; 459 this.AbsolutePosition = pos;
460 this.m_rootPart.SendTerseUpdateToAllClients(); 460 this.m_rootPart.SendTerseUpdateToAllClients();
461 } 461 }
462 462
@@ -482,7 +482,7 @@ namespace OpenSim.Region.Environment.Scenes
482 proper.ObjectData[0].TouchName = enc.GetBytes(this.m_rootPart.TouchName + "\0"); 482 proper.ObjectData[0].TouchName = enc.GetBytes(this.m_rootPart.TouchName + "\0");
483 proper.ObjectData[0].TextureID = new byte[0]; 483 proper.ObjectData[0].TextureID = new byte[0];
484 proper.ObjectData[0].SitName = enc.GetBytes(this.m_rootPart.SitName + "\0"); 484 proper.ObjectData[0].SitName = enc.GetBytes(this.m_rootPart.SitName + "\0");
485 proper.ObjectData[0].Name = enc.GetBytes(this.m_rootPart.PartName + "\0"); 485 proper.ObjectData[0].Name = enc.GetBytes(this.m_rootPart.Name + "\0");
486 proper.ObjectData[0].Description = enc.GetBytes(this.m_rootPart.Description + "\0"); 486 proper.ObjectData[0].Description = enc.GetBytes(this.m_rootPart.Description + "\0");
487 proper.ObjectData[0].OwnerMask = this.m_rootPart.OwnerMask; 487 proper.ObjectData[0].OwnerMask = this.m_rootPart.OwnerMask;
488 proper.ObjectData[0].NextOwnerMask = this.m_rootPart.NextOwnerMask; 488 proper.ObjectData[0].NextOwnerMask = this.m_rootPart.NextOwnerMask;
@@ -502,7 +502,7 @@ namespace OpenSim.Region.Environment.Scenes
502 SceneObjectPart part = this.GetChildPrim(localID); 502 SceneObjectPart part = this.GetChildPrim(localID);
503 if (part != null) 503 if (part != null)
504 { 504 {
505 part.PartName = name; 505 part.Name = name;
506 } 506 }
507 } 507 }
508 508
@@ -636,7 +636,7 @@ namespace OpenSim.Region.Environment.Scenes
636 /// <param name="pos"></param> 636 /// <param name="pos"></param>
637 public void UpdateGroupPosition(LLVector3 pos) 637 public void UpdateGroupPosition(LLVector3 pos)
638 { 638 {
639 this.Pos = pos; 639 this.AbsolutePosition = pos;
640 } 640 }
641 641
642 /// <summary> 642 /// <summary>
@@ -667,7 +667,7 @@ namespace OpenSim.Region.Environment.Scenes
667 private void UpdateRootPosition(LLVector3 pos) 667 private void UpdateRootPosition(LLVector3 pos)
668 { 668 {
669 LLVector3 newPos = new LLVector3(pos.X, pos.Y, pos.Z); 669 LLVector3 newPos = new LLVector3(pos.X, pos.Y, pos.Z);
670 LLVector3 oldPos = new LLVector3(this.Pos.X + this.m_rootPart.OffsetPosition.X, this.Pos.Y + this.m_rootPart.OffsetPosition.Y, this.Pos.Z + this.m_rootPart.OffsetPosition.Z); 670 LLVector3 oldPos = new LLVector3(this.AbsolutePosition.X + this.m_rootPart.OffsetPosition.X, this.AbsolutePosition.Y + this.m_rootPart.OffsetPosition.Y, this.AbsolutePosition.Z + this.m_rootPart.OffsetPosition.Z);
671 LLVector3 diff = oldPos - newPos; 671 LLVector3 diff = oldPos - newPos;
672 Axiom.Math.Vector3 axDiff = new Vector3(diff.X, diff.Y, diff.Z); 672 Axiom.Math.Vector3 axDiff = new Vector3(diff.X, diff.Y, diff.Z);
673 Axiom.Math.Quaternion partRotation = new Quaternion(this.m_rootPart.RotationOffset.W, this.m_rootPart.RotationOffset.X, this.m_rootPart.RotationOffset.Y, this.m_rootPart.RotationOffset.Z); 673 Axiom.Math.Quaternion partRotation = new Quaternion(this.m_rootPart.RotationOffset.W, this.m_rootPart.RotationOffset.X, this.m_rootPart.RotationOffset.Y, this.m_rootPart.RotationOffset.Z);
@@ -683,7 +683,7 @@ namespace OpenSim.Region.Environment.Scenes
683 obPart.OffsetPosition = obPart.OffsetPosition + diff; 683 obPart.OffsetPosition = obPart.OffsetPosition + diff;
684 } 684 }
685 } 685 }
686 this.Pos = newPos; 686 this.AbsolutePosition = newPos;
687 pos.X = newPos.X; 687 pos.X = newPos.X;
688 pos.Y = newPos.Y; 688 pos.Y = newPos.Y;
689 pos.Z = newPos.Z; 689 pos.Z = newPos.Z;
@@ -708,7 +708,7 @@ namespace OpenSim.Region.Environment.Scenes
708 public void UpdateGroupRotation(LLVector3 pos, LLQuaternion rot) 708 public void UpdateGroupRotation(LLVector3 pos, LLQuaternion rot)
709 { 709 {
710 this.m_rootPart.UpdateRotation(rot); 710 this.m_rootPart.UpdateRotation(rot);
711 this.Pos = pos; 711 this.AbsolutePosition = pos;
712 } 712 }
713 713
714 /// <summary> 714 /// <summary>
@@ -828,7 +828,7 @@ namespace OpenSim.Region.Environment.Scenes
828 { 828 {
829 if (m_rootPart == part) 829 if (m_rootPart == part)
830 { 830 {
831 part.SendFullUpdateToClient(remoteClient, Pos); 831 part.SendFullUpdateToClient(remoteClient, AbsolutePosition);
832 } 832 }
833 else 833 else
834 { 834 {
@@ -845,7 +845,7 @@ namespace OpenSim.Region.Environment.Scenes
845 { 845 {
846 if (m_rootPart == part) 846 if (m_rootPart == part)
847 { 847 {
848 part.SendTerseUpdateToClient(remoteClient, Pos); 848 part.SendTerseUpdateToClient(remoteClient, AbsolutePosition);
849 } 849 }
850 else 850 else
851 { 851 {