diff options
| author | Teravus Ovares (Dan Olivares) | 2009-08-31 21:11:04 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-08-31 21:11:04 -0400 |
| commit | de1c2a51e2ee6f8cc6286d22cee6d2cabf1a19aa (patch) | |
| tree | b3bc765860e2f58eb1e74f9d78fc7953a43a5b6e | |
| parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
| download | opensim-SC_OLD-de1c2a51e2ee6f8cc6286d22cee6d2cabf1a19aa.zip opensim-SC_OLD-de1c2a51e2ee6f8cc6286d22cee6d2cabf1a19aa.tar.gz opensim-SC_OLD-de1c2a51e2ee6f8cc6286d22cee6d2cabf1a19aa.tar.bz2 opensim-SC_OLD-de1c2a51e2ee6f8cc6286d22cee6d2cabf1a19aa.tar.xz | |
* Put Borders back the way they were to resolve the endless ----> crossing into region X,Y
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Border.cs | 4 |
1 files 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 | |||
| 103 | case Cardinals.SE: // x+1, y-1 | 103 | case Cardinals.SE: // x+1, y-1 |
| 104 | break; | 104 | break; |
| 105 | case Cardinals.S: // x+0, y-1 | 105 | case Cardinals.S: // x+0, y-1 |
| 106 | if (position.X >= BorderLine.X && position.X <= BorderLine.Y && position.Y < BorderLine.Z) | 106 | if (position.X >= BorderLine.X && position.X <= BorderLine.Y && position.Y-1 < BorderLine.Z) |
| 107 | { | 107 | { |
| 108 | return true; | 108 | return true; |
| 109 | } | 109 | } |
| @@ -111,7 +111,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 111 | case Cardinals.SW: // x-1, y-1 | 111 | case Cardinals.SW: // x-1, y-1 |
| 112 | break; | 112 | break; |
| 113 | case Cardinals.W: // x-1, y+0 | 113 | case Cardinals.W: // x-1, y+0 |
| 114 | if (position.Y >= BorderLine.X && position.Y <= BorderLine.Y && position.X < BorderLine.Z) | 114 | if (position.Y >= BorderLine.X && position.Y <= BorderLine.Y && position.X-1 < BorderLine.Z) |
| 115 | { | 115 | { |
| 116 | return true; | 116 | return true; |
| 117 | } | 117 | } |