diff options
| author | Justin Clark-Casey (justincc) | 2010-07-23 22:37:10 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-07-23 22:37:10 +0100 |
| commit | 18117d8c9acc0df92608e6d920b901cb5c18bc37 (patch) | |
| tree | 798b4f2697115fd774c9d436592fc15eb86b32a9 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | Merge branch '0.7-post-fixes' of ssh://opensimulator.org/var/git/opensim into... (diff) | |
| parent | Flipped the flavour on post-fixes to Post_Fixes. (diff) | |
| download | opensim-SC_OLD-18117d8c9acc0df92608e6d920b901cb5c18bc37.zip opensim-SC_OLD-18117d8c9acc0df92608e6d920b901cb5c18bc37.tar.gz opensim-SC_OLD-18117d8c9acc0df92608e6d920b901cb5c18bc37.tar.bz2 opensim-SC_OLD-18117d8c9acc0df92608e6d920b901cb5c18bc37.tar.xz | |
Merge branch '0.7-post-fixes' of ssh://opensimulator.org/var/git/opensim into 0.7-post-fixes
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 | } |