Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

iar_mods
Justin Clark-Casey (justincc) 2011-12-15 21:59:01 +00:00
commit 99570d8ebb
1 changed files with 1 additions and 1 deletions

View File

@ -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)))