Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-08-07 05:41:41 +01:00
23 changed files with 27795 additions and 27780 deletions

View File

@@ -359,6 +359,12 @@ namespace OpenSim.Services.Connectors.SimianGrid
return new List<GridRegion>(0);
}
public List<GridRegion> GetHyperlinks(UUID scopeID)
{
// Hypergrid/linked regions are not supported
return new List<GridRegion>();
}
public int GetRegionFlags(UUID scopeID, UUID regionID)
{
const int REGION_ONLINE = 4;