Merge branch 'master' into careminster

This commit is contained in:
Melanie
2012-01-29 22:50:59 +00:00
5 changed files with 76 additions and 6 deletions

View File

@@ -5882,7 +5882,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
foreach (GridRegion sri in neighbors)
{
if (sri.RegionLocX == neighborX && sri.RegionLocY == neighborY)
if (sri.RegionCoordX == neighborX && sri.RegionCoordY == neighborY)
return 0;
}