diff options
| author | Melanie | 2010-07-17 07:19:58 +0100 |
|---|---|---|
| committer | Melanie | 2010-07-17 07:19:58 +0100 |
| commit | 373ac901560b3aaa4b531512152da9206bf89dcf (patch) | |
| tree | 087041eb92247366f982e119c0d48bcca1afdf42 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | Stop occasional permanently high 100% utilization when the server is started ... (diff) | |
| download | opensim-SC-373ac901560b3aaa4b531512152da9206bf89dcf.zip opensim-SC-373ac901560b3aaa4b531512152da9206bf89dcf.tar.gz opensim-SC-373ac901560b3aaa4b531512152da9206bf89dcf.tar.bz2 opensim-SC-373ac901560b3aaa4b531512152da9206bf89dcf.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 fe5e948..aa41354 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 | } |