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

@@ -92,6 +92,7 @@ namespace OpenSim.Services.Interfaces
List<GridRegion> GetDefaultRegions(UUID scopeID);
List<GridRegion> GetFallbackRegions(UUID scopeID, int x, int y);
List<GridRegion> GetHyperlinks(UUID scopeID);
int GetRegionFlags(UUID scopeID, UUID regionID);
}