diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index e5cfed0..b2502e0 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -3521,9 +3521,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
3521 | 3521 | ||
3522 | if (part != null && part.ParentGroup != null) | 3522 | if (part != null && part.ParentGroup != null) |
3523 | { | 3523 | { |
3524 | ObjectChangeWhat what = data.what; | 3524 | ObjectChangeType change = data.change; |
3525 | bool togroup = ((what & ObjectChangeWhat.Group) != 0); | 3525 | bool togroup = ((change & ObjectChangeType.Group) != 0); |
3526 | // bool uniform = ((what & ObjectChangeWhat.UniformScale) != 0); not in use | 3526 | // bool uniform = ((what & ObjectChangeType.UniformScale) != 0); not in use |
3527 | 3527 | ||
3528 | SceneObjectGroup group = part.ParentGroup; | 3528 | SceneObjectGroup group = part.ParentGroup; |
3529 | PhysicsActor pha = group.RootPart.PhysActor; | 3529 | PhysicsActor pha = group.RootPart.PhysActor; |
@@ -3533,17 +3533,17 @@ namespace OpenSim.Region.Framework.Scenes | |||
3533 | if (togroup) | 3533 | if (togroup) |
3534 | { | 3534 | { |
3535 | // related to group | 3535 | // related to group |
3536 | if ((what & ObjectChangeWhat.Position) != 0) | 3536 | if ((change & ObjectChangeType.Position) != 0) |
3537 | { | 3537 | { |
3538 | group.AbsolutePosition = data.position; | 3538 | group.AbsolutePosition = data.position; |
3539 | updateType = updatetype.groupterse; | 3539 | updateType = updatetype.groupterse; |
3540 | } | 3540 | } |
3541 | if ((what & ObjectChangeWhat.Rotation) != 0) | 3541 | if ((change & ObjectChangeType.Rotation) != 0) |
3542 | { | 3542 | { |
3543 | group.RootPart.UpdateRotation(data.rotation); | 3543 | group.RootPart.UpdateRotation(data.rotation); |
3544 | updateType = updatetype.none; | 3544 | updateType = updatetype.none; |
3545 | } | 3545 | } |
3546 | if ((what & ObjectChangeWhat.Scale) != 0) | 3546 | if ((change & ObjectChangeType.Scale) != 0) |
3547 | { | 3547 | { |
3548 | if (pha != null) | 3548 | if (pha != null) |
3549 | pha.Building = true; | 3549 | pha.Building = true; |
@@ -3566,26 +3566,26 @@ namespace OpenSim.Region.Framework.Scenes | |||
3566 | 3566 | ||
3567 | if (part == group.RootPart) | 3567 | if (part == group.RootPart) |
3568 | { | 3568 | { |
3569 | if ((what & ObjectChangeWhat.Position) != 0) | 3569 | if ((change & ObjectChangeType.Position) != 0) |
3570 | group.UpdateRootPosition(data.position); | 3570 | group.UpdateRootPosition(data.position); |
3571 | if ((what & ObjectChangeWhat.Rotation) != 0) | 3571 | if ((change & ObjectChangeType.Rotation) != 0) |
3572 | group.UpdateRootRotation(data.rotation); | 3572 | group.UpdateRootRotation(data.rotation); |
3573 | if ((what & ObjectChangeWhat.Scale) != 0) | 3573 | if ((change & ObjectChangeType.Scale) != 0) |
3574 | part.Resize(data.scale); | 3574 | part.Resize(data.scale); |
3575 | } | 3575 | } |
3576 | else | 3576 | else |
3577 | { | 3577 | { |
3578 | if ((what & ObjectChangeWhat.Position) != 0) | 3578 | if ((change & ObjectChangeType.Position) != 0) |
3579 | { | 3579 | { |
3580 | part.OffsetPosition = data.position; | 3580 | part.OffsetPosition = data.position; |
3581 | updateType = updatetype.partterse; | 3581 | updateType = updatetype.partterse; |
3582 | } | 3582 | } |
3583 | if ((what & ObjectChangeWhat.Rotation) != 0) | 3583 | if ((change & ObjectChangeType.Rotation) != 0) |
3584 | { | 3584 | { |
3585 | part.UpdateRotation(data.rotation); | 3585 | part.UpdateRotation(data.rotation); |
3586 | updateType = updatetype.none; | 3586 | updateType = updatetype.none; |
3587 | } | 3587 | } |
3588 | if ((what & ObjectChangeWhat.Scale) != 0) | 3588 | if ((change & ObjectChangeType.Scale) != 0) |
3589 | { | 3589 | { |
3590 | part.Resize(data.scale); | 3590 | part.Resize(data.scale); |
3591 | updateType = updatetype.none; | 3591 | updateType = updatetype.none; |