aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
index 5111deb..8a649ab 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
@@ -126,7 +126,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
126 foreach (MapBlockData b in mapBlocks) 126 foreach (MapBlockData b in mapBlocks)
127 { 127 {
128 b.Name = string.Empty; 128 b.Name = string.Empty;
129 // Set 'simulator is offline'. We need this because the viewer ignores SimAccess.Unknown (255) 129 // Set 'simulator is offline'. We need this because the viewer ignores SimAccess.Unknown (255)
130 b.Access = (byte)SimAccess.Down; 130 b.Access = (byte)SimAccess.Down;
131 } 131 }
132 132
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