From fc9930e420d4b8f9125754b8f0ee7d2c53eec592 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 15 Feb 2014 18:49:40 -0800
Subject: Repair check for if in region position (I mean || is kinda like &&).

---
 OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs | 2 +-
 OpenSim/Region/Framework/Scenes/Scene.cs                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim')

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
                     foreach (MapBlockData b in mapBlocks)
                     {
                         b.Name = string.Empty;
-                        // Set 'simulator is offline'. We need this because the viewer ignores SimAccess.Unknown (255)
+                        // Set 'simulator is offline'. We need this because the viewer ignores SimAccess.Unknown (255)
                         b.Access = (byte)SimAccess.Down;
                     }
 
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
             if (regionCombinerModule == null)
             {
                 // Regular region. Just check for region size
-                if (xx < RegionInfo.RegionSizeX || yy < RegionInfo.RegionSizeY )
+                if (xx < RegionInfo.RegionSizeX && yy < RegionInfo.RegionSizeY )
                     ret = true;
             }
             else
-- 
cgit v1.1