aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorRobert Adams2014-02-15 18:49:40 -0800
committerRobert Adams2014-02-15 18:49:40 -0800
commitfc9930e420d4b8f9125754b8f0ee7d2c53eec592 (patch)
tree02d19d341d5cb1410c82c72220440c272e0fea8c /OpenSim/Region/Framework
parentFix displacement and location operations on legacy trees and grass in (diff)
downloadopensim-SC_OLD-fc9930e420d4b8f9125754b8f0ee7d2c53eec592.zip
opensim-SC_OLD-fc9930e420d4b8f9125754b8f0ee7d2c53eec592.tar.gz
opensim-SC_OLD-fc9930e420d4b8f9125754b8f0ee7d2c53eec592.tar.bz2
opensim-SC_OLD-fc9930e420d4b8f9125754b8f0ee7d2c53eec592.tar.xz
Repair check for if in region position (I mean || is kinda like &&).
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 682c2aa..ecf1753 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2420,7 +2420,7 @@ namespace OpenSim.Region.Framework.Scenes
2420 if (regionCombinerModule == null) 2420 if (regionCombinerModule == null)
2421 { 2421 {
2422 // Regular region. Just check for region size 2422 // Regular region. Just check for region size
2423 if (xx < RegionInfo.RegionSizeX || yy < RegionInfo.RegionSizeY ) 2423 if (xx < RegionInfo.RegionSizeX && yy < RegionInfo.RegionSizeY )
2424 ret = true; 2424 ret = true;
2425 } 2425 }
2426 else 2426 else