Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
commit
99570d8ebb
|
@ -415,7 +415,7 @@ namespace OpenSim.Region.RegionCombinerModule
|
||||||
//xxy
|
//xxy
|
||||||
//xxx
|
//xxx
|
||||||
//xxx
|
//xxx
|
||||||
if ((((int)conn.X * (int)Constants.RegionSize) + conn.YEnd
|
if ((((int)conn.X * (int)Constants.RegionSize) + conn.XEnd
|
||||||
>= (regionConnections.X * (int)Constants.RegionSize))
|
>= (regionConnections.X * (int)Constants.RegionSize))
|
||||||
&& (((int)conn.Y * (int)Constants.RegionSize) + conn.YEnd
|
&& (((int)conn.Y * (int)Constants.RegionSize) + conn.YEnd
|
||||||
>= (regionConnections.Y * (int)Constants.RegionSize)))
|
>= (regionConnections.Y * (int)Constants.RegionSize)))
|
||||||
|
|
Loading…
Reference in New Issue