aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-12-15 21:59:01 +0000
committerJustin Clark-Casey (justincc)2011-12-15 21:59:01 +0000
commit99570d8ebb7686b08cdff6d0a3c4acf761200623 (patch)
tree0dcf55b6643570e933dfbb231811feb72e764d60 /OpenSim
parentCode cleanup related to ScenePresence.PhysicsActor and OdeScene/OdeCharacter (diff)
parentminor fix to MegaRegions, typo spotted by Ubit! (diff)
downloadopensim-SC_OLD-99570d8ebb7686b08cdff6d0a3c4acf761200623.zip
opensim-SC_OLD-99570d8ebb7686b08cdff6d0a3c4acf761200623.tar.gz
opensim-SC_OLD-99570d8ebb7686b08cdff6d0a3c4acf761200623.tar.bz2
opensim-SC_OLD-99570d8ebb7686b08cdff6d0a3c4acf761200623.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
index 9b468dd..09da97a 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
@@ -415,7 +415,7 @@ namespace OpenSim.Region.RegionCombinerModule
415 //xxy 415 //xxy
416 //xxx 416 //xxx
417 //xxx 417 //xxx
418 if ((((int)conn.X * (int)Constants.RegionSize) + conn.YEnd 418 if ((((int)conn.X * (int)Constants.RegionSize) + conn.XEnd
419 >= (regionConnections.X * (int)Constants.RegionSize)) 419 >= (regionConnections.X * (int)Constants.RegionSize))
420 && (((int)conn.Y * (int)Constants.RegionSize) + conn.YEnd 420 && (((int)conn.Y * (int)Constants.RegionSize) + conn.YEnd
421 >= (regionConnections.Y * (int)Constants.RegionSize))) 421 >= (regionConnections.Y * (int)Constants.RegionSize)))