Merge branch 'master' of /home/opensim/var/repo/opensim

integration
BlueWall 2012-04-08 20:58:56 -04:00
commit 27845de7ea
1 changed files with 3 additions and 1 deletions

View File

@ -156,7 +156,9 @@ namespace OpenSim.Region.Framework.Scenes
// that the region position is cached or performance will degrade
Utils.LongToUInts(regionHandle, out x, out y);
GridRegion dest = m_scene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y);
// bool v = true;
if (dest == null)
continue;
if (!simulatorList.Contains(dest.ServerURI))
{
// we havent seen this simulator before, add it to the list