diff options
| author | Melanie Thielker | 2010-07-21 12:16:30 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2010-07-21 12:16:30 +0200 |
| commit | d4022becc3e0911a748e37951ef2d7b24579a4ed (patch) | |
| tree | 39bba6a44a6f6682eb7e89245fa265d0a4da9f10 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | Refine autoreturn a bit (diff) | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC_OLD-d4022becc3e0911a748e37951ef2d7b24579a4ed.zip opensim-SC_OLD-d4022becc3e0911a748e37951ef2d7b24579a4ed.tar.gz opensim-SC_OLD-d4022becc3e0911a748e37951ef2d7b24579a4ed.tar.bz2 opensim-SC_OLD-d4022becc3e0911a748e37951ef2d7b24579a4ed.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
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 e738dd2..24d260e 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 | } |