diff options
author | UbitUmarov | 2012-03-07 07:31:26 +0000 |
---|---|---|
committer | UbitUmarov | 2012-03-07 07:31:26 +0000 |
commit | 3d3b81e67698cc361a9eca28083f5f526ff1de2e (patch) | |
tree | 22b71ba2e23bcd2297f0f8be7470b76fdd9d08e6 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
parent | Prevent scripted region crossings from crashing with prim limits enabled (diff) | |
download | opensim-SC_OLD-3d3b81e67698cc361a9eca28083f5f526ff1de2e.zip opensim-SC_OLD-3d3b81e67698cc361a9eca28083f5f526ff1de2e.tar.gz opensim-SC_OLD-3d3b81e67698cc361a9eca28083f5f526ff1de2e.tar.bz2 opensim-SC_OLD-3d3b81e67698cc361a9eca28083f5f526ff1de2e.tar.xz |
changes on undo/redo (untested/incomplete). Think we may consider moving this mfrom SOP to client side. At least does seem to work a bit better ( again there wwas a issue on sop.copy )
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 8809cd0..038eaa4 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -549,11 +549,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
549 | val.Z = Util.Clamp<float>(oldp.Z, 0.5f, 4096.0f); | 549 | val.Z = Util.Clamp<float>(oldp.Z, 0.5f, 4096.0f); |
550 | } | 550 | } |
551 | } | 551 | } |
552 | 552 | /* don't see the need but worse don't see where is restored to false if things stay in | |
553 | foreach (SceneObjectPart part in m_parts.GetArray()) | 553 | foreach (SceneObjectPart part in m_parts.GetArray()) |
554 | { | 554 | { |
555 | part.IgnoreUndoUpdate = true; | 555 | part.IgnoreUndoUpdate = true; |
556 | } | 556 | } |
557 | */ | ||
557 | if (RootPart.GetStatusSandbox()) | 558 | if (RootPart.GetStatusSandbox()) |
558 | { | 559 | { |
559 | if (Util.GetDistanceTo(RootPart.StatusSandboxPos, value) > 10) | 560 | if (Util.GetDistanceTo(RootPart.StatusSandboxPos, value) > 10) |
@@ -3519,7 +3520,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3519 | if (part.UUID == m_rootPart.UUID) | 3520 | if (part.UUID == m_rootPart.UUID) |
3520 | { | 3521 | { |
3521 | UpdateRootRotation(rot); | 3522 | UpdateRootRotation(rot); |
3522 | if (!m_rootPart.Undoing) | 3523 | /* if (!m_rootPart.Undoing) |
3523 | { | 3524 | { |
3524 | m_rootPart.Undoing = true; | 3525 | m_rootPart.Undoing = true; |
3525 | AbsolutePosition = pos; | 3526 | AbsolutePosition = pos; |
@@ -3527,8 +3528,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
3527 | } | 3528 | } |
3528 | else | 3529 | else |
3529 | { | 3530 | { |
3531 | */ | ||
3530 | AbsolutePosition = pos; | 3532 | AbsolutePosition = pos; |
3531 | } | 3533 | // } |
3532 | } | 3534 | } |
3533 | else | 3535 | else |
3534 | { | 3536 | { |