diff options
author | Melanie | 2019-10-06 19:51:46 +0100 |
---|---|---|
committer | Melanie | 2019-10-06 19:51:46 +0100 |
commit | 22599fbf29910b62b10c243c194cdf75dfc3d821 (patch) | |
tree | 9e9c837f6107fd53526964ef01835de0cff88f59 /OpenSim/Services/GridService/HypergridLinker.cs | |
parent | Fix an issue where parameter parsing could lead to an exception (diff) | |
download | opensim-SC-22599fbf29910b62b10c243c194cdf75dfc3d821.zip opensim-SC-22599fbf29910b62b10c243c194cdf75dfc3d821.tar.gz opensim-SC-22599fbf29910b62b10c243c194cdf75dfc3d821.tar.bz2 opensim-SC-22599fbf29910b62b10c243c194cdf75dfc3d821.tar.xz |
Remove a no longer used property that used ScopeID in an improper way
Diffstat (limited to 'OpenSim/Services/GridService/HypergridLinker.cs')
-rw-r--r-- | OpenSim/Services/GridService/HypergridLinker.cs | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index 74d5abd..9c66e3d 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs | |||
@@ -69,34 +69,6 @@ namespace OpenSim.Services.GridService | |||
69 | protected string m_ThisGatekeeperHost = string.Empty; | 69 | protected string m_ThisGatekeeperHost = string.Empty; |
70 | protected string m_ThisGateKeeperIP = string.Empty; | 70 | protected string m_ThisGateKeeperIP = string.Empty; |
71 | 71 | ||
72 | protected GridRegion m_DefaultRegion; | ||
73 | protected GridRegion DefaultRegion | ||
74 | { | ||
75 | get | ||
76 | { | ||
77 | if (m_DefaultRegion == null) | ||
78 | { | ||
79 | List<GridRegion> defs = m_GridService.GetDefaultHypergridRegions(m_ScopeID); | ||
80 | if (defs != null && defs.Count > 0) | ||
81 | m_DefaultRegion = defs[0]; | ||
82 | else | ||
83 | { | ||
84 | // Get any region | ||
85 | defs = m_GridService.GetRegionsByName(m_ScopeID, "", 1); | ||
86 | if (defs != null && defs.Count > 0) | ||
87 | m_DefaultRegion = defs[0]; | ||
88 | else | ||
89 | { | ||
90 | // This shouldn't happen | ||
91 | m_DefaultRegion = new GridRegion(1000, 1000); | ||
92 | m_log.Error("[HYPERGRID LINKER]: Something is wrong with this grid. It has no regions?"); | ||
93 | } | ||
94 | } | ||
95 | } | ||
96 | return m_DefaultRegion; | ||
97 | } | ||
98 | } | ||
99 | |||
100 | public HypergridLinker(IConfigSource config, GridService gridService, IRegionData db) | 72 | public HypergridLinker(IConfigSource config, GridService gridService, IRegionData db) |
101 | { | 73 | { |
102 | IConfig gridConfig = config.Configs["GridService"]; | 74 | IConfig gridConfig = config.Configs["GridService"]; |