diff options
| author | Melanie | 2010-07-21 12:03:44 +0100 |
|---|---|---|
| committer | Melanie | 2010-07-21 12:03:44 +0100 |
| commit | f63a4c8f2f5a67fb7e14d6905c137c55aa9d4939 (patch) | |
| tree | 9f03819e2c0b38bd68e5679012c684d5cc59d00e /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | Resync with master (diff) | |
| parent | Allow Megaregions to start properly after an unclean shutdown (diff) | |
| download | opensim-SC_OLD-f63a4c8f2f5a67fb7e14d6905c137c55aa9d4939.zip opensim-SC_OLD-f63a4c8f2f5a67fb7e14d6905c137c55aa9d4939.tar.gz opensim-SC_OLD-f63a4c8f2f5a67fb7e14d6905c137c55aa9d4939.tar.bz2 opensim-SC_OLD-f63a4c8f2f5a67fb7e14d6905c137c55aa9d4939.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -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 7053c02..fb75120 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -439,7 +439,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 439 | 439 | ||
| 440 | if ((m_scene.TestBorderCross(val - Vector3.UnitX, Cardinals.E) || m_scene.TestBorderCross(val + Vector3.UnitX, Cardinals.W) | 440 | if ((m_scene.TestBorderCross(val - Vector3.UnitX, Cardinals.E) || m_scene.TestBorderCross(val + Vector3.UnitX, Cardinals.W) |
| 441 | || m_scene.TestBorderCross(val - Vector3.UnitY, Cardinals.N) || m_scene.TestBorderCross(val + Vector3.UnitY, Cardinals.S)) | 441 | || m_scene.TestBorderCross(val - Vector3.UnitY, Cardinals.N) || m_scene.TestBorderCross(val + Vector3.UnitY, Cardinals.S)) |
| 442 | && !IsAttachmentCheckFull()) | 442 | && !IsAttachmentCheckFull() && (!m_scene.LoadingPrims)) |
| 443 | { | 443 | { |
| 444 | m_scene.CrossPrimGroupIntoNewRegion(val, this, true); | 444 | m_scene.CrossPrimGroupIntoNewRegion(val, this, true); |
| 445 | } | 445 | } |