diff options
| author | Melanie | 2010-07-17 07:19:58 +0100 |
|---|---|---|
| committer | Melanie | 2010-07-20 23:24:04 +0100 |
| commit | ac1a34714dec8745ec78bf530d74ada0943c6758 (patch) | |
| tree | c2d3a6a5304a5b4d9a8711078d94b26a960d0f8a /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | Restore lines that have been removed due to previous merge conflict. (diff) | |
| download | opensim-SC_OLD-ac1a34714dec8745ec78bf530d74ada0943c6758.zip opensim-SC_OLD-ac1a34714dec8745ec78bf530d74ada0943c6758.tar.gz opensim-SC_OLD-ac1a34714dec8745ec78bf530d74ada0943c6758.tar.bz2 opensim-SC_OLD-ac1a34714dec8745ec78bf530d74ada0943c6758.tar.xz | |
Allow Megaregions to start properly after an unclean shutdown
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 1ca390a..17275d0 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -294,7 +294,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 294 | 294 | ||
| 295 | if ((m_scene.TestBorderCross(val - Vector3.UnitX, Cardinals.E) || m_scene.TestBorderCross(val + Vector3.UnitX, Cardinals.W) | 295 | if ((m_scene.TestBorderCross(val - Vector3.UnitX, Cardinals.E) || m_scene.TestBorderCross(val + Vector3.UnitX, Cardinals.W) |
| 296 | || m_scene.TestBorderCross(val - Vector3.UnitY, Cardinals.N) || m_scene.TestBorderCross(val + Vector3.UnitY, Cardinals.S)) | 296 | || m_scene.TestBorderCross(val - Vector3.UnitY, Cardinals.N) || m_scene.TestBorderCross(val + Vector3.UnitY, Cardinals.S)) |
| 297 | && !IsAttachmentCheckFull()) | 297 | && !IsAttachmentCheckFull() && (!m_scene.LoadingPrims)) |
| 298 | { | 298 | { |
| 299 | m_scene.CrossPrimGroupIntoNewRegion(val, this, true); | 299 | m_scene.CrossPrimGroupIntoNewRegion(val, this, true); |
| 300 | } | 300 | } |