diff options
| author | Tom Grimshaw | 2010-07-22 10:49:14 -0700 |
|---|---|---|
| committer | Tom Grimshaw | 2010-07-22 10:49:14 -0700 |
| commit | bf374705c6714f3645fddab0e6dd05bf62720775 (patch) | |
| tree | d637be82779749d82e4157a18b69eecf0e73c898 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | Add config option securePermissionsLoading which will stop the region from lo... (diff) | |
| parent | Allow megaregions to be used in M7, should we so decide (diff) | |
| download | opensim-SC-bf374705c6714f3645fddab0e6dd05bf62720775.zip opensim-SC-bf374705c6714f3645fddab0e6dd05bf62720775.tar.gz opensim-SC-bf374705c6714f3645fddab0e6dd05bf62720775.tar.bz2 opensim-SC-bf374705c6714f3645fddab0e6dd05bf62720775.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/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 | } |