diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to 'OpenSim/Services/HypergridService/UserAgentService.cs')
-rw-r--r-- | OpenSim/Services/HypergridService/UserAgentService.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs index 95876b8..ec76508 100644 --- a/OpenSim/Services/HypergridService/UserAgentService.cs +++ b/OpenSim/Services/HypergridService/UserAgentService.cs | |||
@@ -131,7 +131,8 @@ namespace OpenSim.Services.HypergridService | |||
131 | LoadDomainExceptionsFromConfig(serverConfig, "AllowExcept", m_TripsAllowedExceptions); | 131 | LoadDomainExceptionsFromConfig(serverConfig, "AllowExcept", m_TripsAllowedExceptions); |
132 | LoadDomainExceptionsFromConfig(serverConfig, "DisallowExcept", m_TripsDisallowedExceptions); | 132 | LoadDomainExceptionsFromConfig(serverConfig, "DisallowExcept", m_TripsDisallowedExceptions); |
133 | 133 | ||
134 | m_GridName = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", new string[] {"Startup", "UserAgentService"}); | 134 | m_GridName = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", |
135 | new string[] { "Startup", "Hypergrid", "UserAgentService" }, String.Empty); | ||
135 | if (string.IsNullOrEmpty(m_GridName)) // Legacy. Remove soon. | 136 | if (string.IsNullOrEmpty(m_GridName)) // Legacy. Remove soon. |
136 | { | 137 | { |
137 | m_GridName = serverConfig.GetString("ExternalName", string.Empty); | 138 | m_GridName = serverConfig.GetString("ExternalName", string.Empty); |