diff options
| author | Melanie | 2013-09-07 13:54:19 +0100 |
|---|---|---|
| committer | Melanie | 2013-09-07 13:54:19 +0100 |
| commit | 2f365ea80be0df545a74da03afceb964da1546d1 (patch) | |
| tree | a54202b1cdabaa201c0566232bde69cecdcfef6a /OpenSim/Services/Interfaces | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-2f365ea80be0df545a74da03afceb964da1546d1.zip opensim-SC_OLD-2f365ea80be0df545a74da03afceb964da1546d1.tar.gz opensim-SC_OLD-2f365ea80be0df545a74da03afceb964da1546d1.tar.bz2 opensim-SC_OLD-2f365ea80be0df545a74da03afceb964da1546d1.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Services/Interfaces')
| -rw-r--r-- | OpenSim/Services/Interfaces/IGridService.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs index cecbe9e..e3c70d3 100644 --- a/OpenSim/Services/Interfaces/IGridService.cs +++ b/OpenSim/Services/Interfaces/IGridService.cs | |||
| @@ -97,6 +97,7 @@ namespace OpenSim.Services.Interfaces | |||
| 97 | List<GridRegion> GetRegionRange(UUID scopeID, int xmin, int xmax, int ymin, int ymax); | 97 | List<GridRegion> GetRegionRange(UUID scopeID, int xmin, int xmax, int ymin, int ymax); |
| 98 | 98 | ||
| 99 | List<GridRegion> GetDefaultRegions(UUID scopeID); | 99 | List<GridRegion> GetDefaultRegions(UUID scopeID); |
| 100 | List<GridRegion> GetDefaultHypergridRegions(UUID scopeID); | ||
| 100 | List<GridRegion> GetFallbackRegions(UUID scopeID, int x, int y); | 101 | List<GridRegion> GetFallbackRegions(UUID scopeID, int x, int y); |
| 101 | List<GridRegion> GetHyperlinks(UUID scopeID); | 102 | List<GridRegion> GetHyperlinks(UUID scopeID); |
| 102 | 103 | ||