OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Repair check for if in region position (I mean || is kinda like &&).

0.8.0.3
Robert Adams 2014-02-15 18:49:40 -08:00
parent 79200ed270
commit fc9930e420
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
View File

@ -126,7 +126,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
foreach (MapBlockData b in mapBlocks) foreach (MapBlockData b in mapBlocks)
{ {
b.Name = string.Empty; 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; b.Access = (byte)SimAccess.Down;
} }

2
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -2420,7 +2420,7 @@ namespace OpenSim.Region.Framework.Scenes
if (regionCombinerModule == null) if (regionCombinerModule == null)
{ {
// Regular region. Just check for region size // Regular region. Just check for region size
if (xx < RegionInfo.RegionSizeX || yy < RegionInfo.RegionSizeY ) if (xx < RegionInfo.RegionSizeX && yy < RegionInfo.RegionSizeY )
ret = true; ret = true;
} }
else else