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/GridService/HypergridLinker.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 'OpenSim/Services/GridService/HypergridLinker.cs')
| -rw-r--r-- | OpenSim/Services/GridService/HypergridLinker.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index 8335724..4024295 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs | |||
| @@ -79,7 +79,7 @@ namespace OpenSim.Services.GridService | |||
| 79 | { | 79 | { |
| 80 | if (m_DefaultRegion == null) | 80 | if (m_DefaultRegion == null) |
| 81 | { | 81 | { |
| 82 | List<GridRegion> defs = m_GridService.GetDefaultRegions(m_ScopeID); | 82 | List<GridRegion> defs = m_GridService.GetDefaultHypergridRegions(m_ScopeID); |
| 83 | if (defs != null && defs.Count > 0) | 83 | if (defs != null && defs.Count > 0) |
| 84 | m_DefaultRegion = defs[0]; | 84 | m_DefaultRegion = defs[0]; |
| 85 | else | 85 | else |