diff options
A bit more work on prim building related code. Think most of the building tools are now connected up and its now just a case of doing some bug fixing.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | 12 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 3 |
2 files changed, 7 insertions, 8 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs index 0180e14..d94a748 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | |||
@@ -541,7 +541,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
541 | if (hasPrim != false) | 541 | if (hasPrim != false) |
542 | { | 542 | { |
543 | ((SceneObjectGroup)ent).UpdateGroupRotation(pos, rot); | 543 | ((SceneObjectGroup)ent).UpdateGroupRotation(pos, rot); |
544 | // prim.UpdateGroupMouseRotation(pos, rot); | ||
545 | break; | 544 | break; |
546 | } | 545 | } |
547 | } | 546 | } |
@@ -565,7 +564,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
565 | if (hasPrim != false) | 564 | if (hasPrim != false) |
566 | { | 565 | { |
567 | ((SceneObjectGroup)ent).UpdateGroupRotation(rot); | 566 | ((SceneObjectGroup)ent).UpdateGroupRotation(rot); |
568 | //prim.UpdateGroupRotation(rot); | ||
569 | break; | 567 | break; |
570 | } | 568 | } |
571 | } | 569 | } |
@@ -580,16 +578,15 @@ namespace OpenSim.Region.Environment.Scenes | |||
580 | /// <param name="remoteClient"></param> | 578 | /// <param name="remoteClient"></param> |
581 | public void UpdatePrimSingleRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient) | 579 | public void UpdatePrimSingleRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient) |
582 | { | 580 | { |
583 | //Console.WriteLine("trying to update single prim rotation"); | 581 | bool hasPrim = false; |
584 | Primitive prim = null; | ||
585 | foreach (EntityBase ent in Entities.Values) | 582 | foreach (EntityBase ent in Entities.Values) |
586 | { | 583 | { |
587 | if (ent is SceneObjectGroup) | 584 | if (ent is SceneObjectGroup) |
588 | { | 585 | { |
589 | // prim = ((SceneObject)ent).HasChildPrim(localID); | 586 | hasPrim = ((SceneObjectGroup)ent).HasChildPrim(localID); |
590 | if (prim != null) | 587 | if (hasPrim != false) |
591 | { | 588 | { |
592 | prim.UpdateSingleRotation(rot); | 589 | ((SceneObjectGroup)ent).UpdateSingleRotation(rot, localID); |
593 | break; | 590 | break; |
594 | } | 591 | } |
595 | } | 592 | } |
@@ -613,7 +610,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
613 | if (hasPrim != false) | 610 | if (hasPrim != false) |
614 | { | 611 | { |
615 | ((SceneObjectGroup)ent).Resize(scale, localID); | 612 | ((SceneObjectGroup)ent).Resize(scale, localID); |
616 | // prim.ResizeGoup(scale); | ||
617 | break; | 613 | break; |
618 | } | 614 | } |
619 | } | 615 | } |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index cd38b23..1b7ff23 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -755,6 +755,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
755 | public void UpdateGroupRotation(LLQuaternion rot) | 755 | public void UpdateGroupRotation(LLQuaternion rot) |
756 | { | 756 | { |
757 | this.m_rootPart.UpdateRotation(rot); | 757 | this.m_rootPart.UpdateRotation(rot); |
758 | this.ScheduleGroupForTerseUpdate(); | ||
758 | } | 759 | } |
759 | 760 | ||
760 | /// <summary> | 761 | /// <summary> |
@@ -766,6 +767,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
766 | { | 767 | { |
767 | this.m_rootPart.UpdateRotation(rot); | 768 | this.m_rootPart.UpdateRotation(rot); |
768 | this.AbsolutePosition = pos; | 769 | this.AbsolutePosition = pos; |
770 | this.ScheduleGroupForTerseUpdate(); | ||
769 | } | 771 | } |
770 | 772 | ||
771 | /// <summary> | 773 | /// <summary> |
@@ -813,6 +815,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
813 | prim.RotationOffset = new LLQuaternion(newRot.w, newRot.x, newRot.y, newRot.z); | 815 | prim.RotationOffset = new LLQuaternion(newRot.w, newRot.x, newRot.y, newRot.z); |
814 | } | 816 | } |
815 | } | 817 | } |
818 | this.m_rootPart.ScheduleTerseUpdate(); | ||
816 | } | 819 | } |
817 | #endregion | 820 | #endregion |
818 | /// <summary> | 821 | /// <summary> |