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/Border.cs | |
parent | Prevent the Viewer's threaded inventory retrieval causing a OOM and overload (diff) | |
download | opensim-SC-9505297fb109e800be5733066f05f53d97eafe84.zip opensim-SC-9505297fb109e800be5733066f05f53d97eafe84.tar.gz opensim-SC-9505297fb109e800be5733066f05f53d97eafe84.tar.bz2 opensim-SC-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 '')
-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 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 | |||
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-1 < BorderLine.Z) | 106 | if (position.X >= BorderLine.X && position.X <= BorderLine.Y && position.Y < 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-1 < BorderLine.Z) | 114 | if (position.Y >= BorderLine.X && position.Y <= BorderLine.Y && position.X < BorderLine.Z) |
115 | { | 115 | { |
116 | return true; | 116 | return true; |
117 | } | 117 | } |