From cc30fce49f212bea86335d0f6adec2f49e1809bb Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Mon, 31 Aug 2009 20:15:20 -0400
Subject: change regular test target to use nunit exec mode detect if you have
nunit-console2 or nunit-console and use the appropriate one
---
.nant/local.include | 109 ++++++++++++++++++++++++++++++++++++++--------------
1 file changed, 81 insertions(+), 28 deletions(-)
diff --git a/.nant/local.include b/.nant/local.include
index 1e1c030..eaccfdd 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -1,6 +1,7 @@
-
+
+
@@ -29,24 +30,56 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -156,53 +189,73 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
--
cgit v1.1
From 7e9b12ac807510536baa4e86427db25c261ded53 Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Mon, 31 Aug 2009 20:26:16 -0400
Subject: change the nunit detection code
---
.nant/local.include | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/.nant/local.include b/.nant/local.include
index eaccfdd..510bdc6 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -195,15 +195,10 @@
-
-
-
-
+ if="${int::parse(hasnunit2)==1}" />
--
cgit v1.1
From fed089971e594ec9a62f9619777c970733b70861 Mon Sep 17 00:00:00 2001
From: Teravus Ovares (Dan Olivares)
Date: Mon, 31 Aug 2009 20:36:06 -0400
Subject: * Previously south and west border were required to be -1 for border
crossings diagonally to work.. but.. seems they're working now without
it.. and maybe it will help attachments.
---
OpenSim/Region/Framework/Scenes/Border.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/OpenSim/Region/Framework/Scenes/Border.cs b/OpenSim/Region/Framework/Scenes/Border.cs
index 8f02a9c..9a08afe 100644
--- a/OpenSim/Region/Framework/Scenes/Border.cs
+++ b/OpenSim/Region/Framework/Scenes/Border.cs
@@ -103,7 +103,7 @@ namespace OpenSim.Region.Framework.Scenes
case Cardinals.SE: // x+1, y-1
break;
case Cardinals.S: // x+0, y-1
- if (position.X >= BorderLine.X && position.X <= BorderLine.Y && position.Y-1 < BorderLine.Z)
+ if (position.X >= BorderLine.X && position.X <= BorderLine.Y && position.Y < BorderLine.Z)
{
return true;
}
@@ -111,7 +111,7 @@ namespace OpenSim.Region.Framework.Scenes
case Cardinals.SW: // x-1, y-1
break;
case Cardinals.W: // x-1, y+0
- if (position.Y >= BorderLine.X && position.Y <= BorderLine.Y && position.X-1 < BorderLine.Z)
+ if (position.Y >= BorderLine.X && position.Y <= BorderLine.Y && position.X < BorderLine.Z)
{
return true;
}
--
cgit v1.1
From de1c2a51e2ee6f8cc6286d22cee6d2cabf1a19aa Mon Sep 17 00:00:00 2001
From: Teravus Ovares (Dan Olivares)
Date: Mon, 31 Aug 2009 21:11:04 -0400
Subject: * Put Borders back the way they were to resolve the endless ---->
crossing into region X,Y
---
OpenSim/Region/Framework/Scenes/Border.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/OpenSim/Region/Framework/Scenes/Border.cs b/OpenSim/Region/Framework/Scenes/Border.cs
index 9a08afe..8f02a9c 100644
--- a/OpenSim/Region/Framework/Scenes/Border.cs
+++ b/OpenSim/Region/Framework/Scenes/Border.cs
@@ -103,7 +103,7 @@ namespace OpenSim.Region.Framework.Scenes
case Cardinals.SE: // x+1, y-1
break;
case Cardinals.S: // x+0, y-1
- if (position.X >= BorderLine.X && position.X <= BorderLine.Y && position.Y < BorderLine.Z)
+ if (position.X >= BorderLine.X && position.X <= BorderLine.Y && position.Y-1 < BorderLine.Z)
{
return true;
}
@@ -111,7 +111,7 @@ namespace OpenSim.Region.Framework.Scenes
case Cardinals.SW: // x-1, y-1
break;
case Cardinals.W: // x-1, y+0
- if (position.Y >= BorderLine.X && position.Y <= BorderLine.Y && position.X < BorderLine.Z)
+ if (position.Y >= BorderLine.X && position.Y <= BorderLine.Y && position.X-1 < BorderLine.Z)
{
return true;
}
--
cgit v1.1
From 2068b6714a6cf78a19340e9c8db7a3cd69a6f8c6 Mon Sep 17 00:00:00 2001
From: Teravus Ovares (Dan Olivares)
Date: Mon, 31 Aug 2009 21:40:06 -0400
Subject: * -2 on the south and west side, -1 on the north and east side.
Fuzzy borders! yay
---
OpenSim/Region/Framework/Scenes/Scene.cs | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index f4a0d2e..7527d8c 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -337,22 +337,22 @@ namespace OpenSim.Region.Framework.Scenes
BordersLocked = true;
Border northBorder = new Border();
- northBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, (int)Constants.RegionSize); //<---
+ northBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, (int)Constants.RegionSize + 1); //<---
northBorder.CrossDirection = Cardinals.N;
NorthBorders.Add(northBorder);
Border southBorder = new Border();
- southBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, 0); //--->
+ southBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, -2); //--->
southBorder.CrossDirection = Cardinals.S;
SouthBorders.Add(southBorder);
Border eastBorder = new Border();
- eastBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, (int)Constants.RegionSize); //<---
+ eastBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, (int)Constants.RegionSize + 1); //<---
eastBorder.CrossDirection = Cardinals.E;
EastBorders.Add(eastBorder);
Border westBorder = new Border();
- westBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, 0); //--->
+ westBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, -2); //--->
westBorder.CrossDirection = Cardinals.W;
WestBorders.Add(westBorder);
@@ -489,22 +489,22 @@ namespace OpenSim.Region.Framework.Scenes
{
BordersLocked = true;
Border northBorder = new Border();
- northBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, (int)Constants.RegionSize); //<---
+ northBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, (int)Constants.RegionSize + 1); //<---
northBorder.CrossDirection = Cardinals.N;
NorthBorders.Add(northBorder);
Border southBorder = new Border();
- southBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, 0); //--->
+ southBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, -2); //--->
southBorder.CrossDirection = Cardinals.S;
SouthBorders.Add(southBorder);
Border eastBorder = new Border();
- eastBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, (int)Constants.RegionSize); //<---
+ eastBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, (int)Constants.RegionSize + 1); //<---
eastBorder.CrossDirection = Cardinals.E;
EastBorders.Add(eastBorder);
Border westBorder = new Border();
- westBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, 0); //--->
+ westBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, -2); //--->
westBorder.CrossDirection = Cardinals.W;
WestBorders.Add(westBorder);
BordersLocked = false;
--
cgit v1.1