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/Data/IRegionData.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-2f365ea80be0df545a74da03afceb964da1546d1.zip opensim-SC-2f365ea80be0df545a74da03afceb964da1546d1.tar.gz opensim-SC-2f365ea80be0df545a74da03afceb964da1546d1.tar.bz2 opensim-SC-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 '')
| -rw-r--r-- | OpenSim/Data/IRegionData.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Data/IRegionData.cs b/OpenSim/Data/IRegionData.cs index 70e1065..463c621 100644 --- a/OpenSim/Data/IRegionData.cs +++ b/OpenSim/Data/IRegionData.cs | |||
| @@ -81,6 +81,7 @@ namespace OpenSim.Data | |||
| 81 | bool Delete(UUID regionID); | 81 | bool Delete(UUID regionID); |
| 82 | 82 | ||
| 83 | List<RegionData> GetDefaultRegions(UUID scopeID); | 83 | List<RegionData> GetDefaultRegions(UUID scopeID); |
| 84 | List<RegionData> GetDefaultHypergridRegions(UUID scopeID); | ||
| 84 | List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y); | 85 | List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y); |
| 85 | List<RegionData> GetHyperlinks(UUID scopeID); | 86 | List<RegionData> GetHyperlinks(UUID scopeID); |
| 86 | } | 87 | } |