diff options
author | MW | 2009-07-15 10:42:27 +0000 |
---|---|---|
committer | MW | 2009-07-15 10:42:27 +0000 |
commit | 3a72531e4ca3ca52db05f637a219654cc7a02f7d (patch) | |
tree | fdbf25d973b5253c33b94c32b6d55ed5896cf596 /OpenSim/Region | |
parent | A attemp to fix the boundingBox code that I committed the other day. (diff) | |
download | opensim-SC-3a72531e4ca3ca52db05f637a219654cc7a02f7d.zip opensim-SC-3a72531e4ca3ca52db05f637a219654cc7a02f7d.tar.gz opensim-SC-3a72531e4ca3ca52db05f637a219654cc7a02f7d.tar.bz2 opensim-SC-3a72531e4ca3ca52db05f637a219654cc7a02f7d.tar.xz |
More fixing of the boundingbox code.
Still more work needed to get linksets to rezz correctly (not in the ground)
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index dcc39cc..de77862 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -602,6 +602,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
602 | foreach (SceneObjectPart part in m_parts.Values) | 602 | foreach (SceneObjectPart part in m_parts.Values) |
603 | { | 603 | { |
604 | Vector3 worldPos = part.GetWorldPosition(); | 604 | Vector3 worldPos = part.GetWorldPosition(); |
605 | Vector3 offset = worldPos - AbsolutePosition; | ||
605 | Quaternion worldRot = part.GetWorldRotation(); | 606 | Quaternion worldRot = part.GetWorldRotation(); |
606 | 607 | ||
607 | Vector3 frontTopLeft; | 608 | Vector3 frontTopLeft; |
@@ -660,15 +661,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
660 | backTopRight = backTopRight * worldRot; | 661 | backTopRight = backTopRight * worldRot; |
661 | 662 | ||
662 | 663 | ||
663 | //frontTopLeft += worldPos; | 664 | frontTopLeft += offset; |
664 | //frontTopRight += worldPos; | 665 | frontTopRight += offset; |
665 | //frontBottomLeft += worldPos; | 666 | frontBottomLeft += offset; |
666 | //frontBottomRight += worldPos; | 667 | frontBottomRight += offset; |
667 | 668 | ||
668 | //backBottomLeft += worldPos; | 669 | backBottomLeft += offset; |
669 | //backBottomRight += worldPos; | 670 | backBottomRight += offset; |
670 | //backTopLeft += worldPos; | 671 | backTopLeft += offset; |
671 | //backTopRight += worldPos; | 672 | backTopRight += offset; |
672 | 673 | ||
673 | if (frontTopRight.X > maxX) | 674 | if (frontTopRight.X > maxX) |
674 | maxX = frontTopRight.X; | 675 | maxX = frontTopRight.X; |