diff options
author | Teravus Ovares (Dan Olivares) | 2009-09-02 04:39:00 -0400 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-09-02 04:39:00 -0400 |
commit | 9505297fb109e800be5733066f05f53d97eafe84 (patch) | |
tree | 45d659121e21932434310499c2ccf2690231793d /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
parent | Prevent the Viewer's threaded inventory retrieval causing a OOM and overload (diff) | |
download | opensim-SC_OLD-9505297fb109e800be5733066f05f53d97eafe84.zip opensim-SC_OLD-9505297fb109e800be5733066f05f53d97eafe84.tar.gz opensim-SC_OLD-9505297fb109e800be5733066f05f53d97eafe84.tar.bz2 opensim-SC_OLD-9505297fb109e800be5733066f05f53d97eafe84.tar.xz |
* One last attempt to get the bordercrossing/primcrossing/attachmentcrossing right in the new border framework.
* This also contains some inactive preliminary code for disconnecting combined regions that will be used to make one root region a virtual region of a new root region.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 5be074e..6ba7e41 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -263,9 +263,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
263 | set | 263 | set |
264 | { | 264 | { |
265 | Vector3 val = value; | 265 | Vector3 val = value; |
266 | 266 | ||
267 | if ((m_scene.TestBorderCross(val,Cardinals.E) || m_scene.TestBorderCross(val,Cardinals.W) | 267 | if ((m_scene.TestBorderCross(val - Vector3.UnitX, Cardinals.E) || m_scene.TestBorderCross(val + Vector3.UnitX, Cardinals.W) |
268 | || m_scene.TestBorderCross(val, Cardinals.N) || m_scene.TestBorderCross(val, Cardinals.S)) | 268 | || m_scene.TestBorderCross(val - Vector3.UnitY, Cardinals.N) || m_scene.TestBorderCross(val + Vector3.UnitY, Cardinals.S)) |
269 | && !IsAttachment) | 269 | && !IsAttachment) |
270 | { | 270 | { |
271 | m_scene.CrossPrimGroupIntoNewRegion(val, this, true); | 271 | m_scene.CrossPrimGroupIntoNewRegion(val, this, true); |