aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorMelanie2009-09-02 16:29:50 +0100
committerMelanie2009-09-02 16:29:50 +0100
commit8e7b385883a2d9e590490c2d28cd2dbe2a7c5d95 (patch)
treeaa5824b7839df1471077b276bf0cb89c13369805 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
parentCorrect the icons on wearables in agent inventory. To fully correct the issue (diff)
parentswitching LandManagementModule to "new" region module scheme; cleaning (diff)
downloadopensim-SC_OLD-8e7b385883a2d9e590490c2d28cd2dbe2a7c5d95.zip
opensim-SC_OLD-8e7b385883a2d9e590490c2d28cd2dbe2a7c5d95.tar.gz
opensim-SC_OLD-8e7b385883a2d9e590490c2d28cd2dbe2a7c5d95.tar.bz2
opensim-SC_OLD-8e7b385883a2d9e590490c2d28cd2dbe2a7c5d95.tar.xz
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs6
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);