diff options
| author | Melanie | 2010-07-21 19:24:18 +0100 |
|---|---|---|
| committer | Melanie | 2010-07-21 19:24:18 +0100 |
| commit | 9136e02ed3691dd695f70c9ff87436bcc306e0c4 (patch) | |
| tree | d45b4d95652b80364ff050bd4d213d26a58c1962 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | Merge branch '0.6.9-post-fixes' into careminster (diff) | |
| parent | Fix the XML serializationt to provide an empty script state element if (diff) | |
| download | opensim-SC-9136e02ed3691dd695f70c9ff87436bcc306e0c4.zip opensim-SC-9136e02ed3691dd695f70c9ff87436bcc306e0c4.tar.gz opensim-SC-9136e02ed3691dd695f70c9ff87436bcc306e0c4.tar.bz2 opensim-SC-9136e02ed3691dd695f70c9ff87436bcc306e0c4.tar.xz | |
Merge branch '0.6.9-post-fixes' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 93f45e0..54b27b2 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -404,7 +404,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 404 | 404 | ||
| 405 | if ((m_scene.TestBorderCross(val - Vector3.UnitX, Cardinals.E) || m_scene.TestBorderCross(val + Vector3.UnitX, Cardinals.W) | 405 | if ((m_scene.TestBorderCross(val - Vector3.UnitX, Cardinals.E) || m_scene.TestBorderCross(val + Vector3.UnitX, Cardinals.W) |
| 406 | || m_scene.TestBorderCross(val - Vector3.UnitY, Cardinals.N) || m_scene.TestBorderCross(val + Vector3.UnitY, Cardinals.S)) | 406 | || m_scene.TestBorderCross(val - Vector3.UnitY, Cardinals.N) || m_scene.TestBorderCross(val + Vector3.UnitY, Cardinals.S)) |
| 407 | && !IsAttachmentCheckFull()) | 407 | && !IsAttachmentCheckFull() && (!m_scene.LoadingPrims)) |
| 408 | { | 408 | { |
| 409 | m_scene.CrossPrimGroupIntoNewRegion(val, this, true); | 409 | m_scene.CrossPrimGroupIntoNewRegion(val, this, true); |
| 410 | } | 410 | } |