diff options
| author | Teravus Ovares | 2009-07-17 21:32:35 +0000 |
|---|---|---|
| committer | Teravus Ovares | 2009-07-17 21:32:35 +0000 |
| commit | bb4b81d70fece4e0257f1e2f361489062c3595af (patch) | |
| tree | 3e8a103e2f3f5a0f2b8c12b80fcaaaa69d773723 /OpenSim/Region/Framework | |
| parent | * If the world map module encounters an error, not all of the objects will be... (diff) | |
| download | opensim-SC_OLD-bb4b81d70fece4e0257f1e2f361489062c3595af.zip opensim-SC_OLD-bb4b81d70fece4e0257f1e2f361489062c3595af.tar.gz opensim-SC_OLD-bb4b81d70fece4e0257f1e2f361489062c3595af.tar.bz2 opensim-SC_OLD-bb4b81d70fece4e0257f1e2f361489062c3595af.tar.xz | |
* patch from jonc
* Fixes scaling a group in some situations.
* fixes mantis #3886
* Thanks jonc!
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 00ae504..220558b 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -527,8 +527,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 527 | Vector3 partoffset = part.OffsetPosition; | 527 | Vector3 partoffset = part.OffsetPosition; |
| 528 | 528 | ||
| 529 | minScale.X = (partscale.X + partoffset.X < minScale.X) ? partscale.X + partoffset.X : minScale.X; | 529 | minScale.X = (partscale.X + partoffset.X < minScale.X) ? partscale.X + partoffset.X : minScale.X; |
| 530 | minScale.Y = (partscale.Y + partoffset.Y < minScale.Y) ? partscale.X + partoffset.Y : minScale.Y; | 530 | minScale.Y = (partscale.Y + partoffset.Y < minScale.Y) ? partscale.Y + partoffset.Y : minScale.Y; |
| 531 | minScale.Z = (partscale.Z + partoffset.Z < minScale.Z) ? partscale.X + partoffset.Z : minScale.Z; | 531 | minScale.Z = (partscale.Z + partoffset.Z < minScale.Z) ? partscale.Z + partoffset.Z : minScale.Z; |
| 532 | 532 | ||
| 533 | maxScale.X = (partscale.X + partoffset.X > maxScale.X) ? partscale.X + partoffset.X : maxScale.X; | 533 | maxScale.X = (partscale.X + partoffset.X > maxScale.X) ? partscale.X + partoffset.X : maxScale.X; |
| 534 | maxScale.Y = (partscale.Y + partoffset.Y > maxScale.Y) ? partscale.Y + partoffset.Y : maxScale.Y; | 534 | maxScale.Y = (partscale.Y + partoffset.Y > maxScale.Y) ? partscale.Y + partoffset.Y : maxScale.Y; |