diff options
| author | Diva Canto | 2013-02-27 20:59:16 -0800 |
|---|---|---|
| committer | Diva Canto | 2013-02-27 20:59:16 -0800 |
| commit | bb447581795cb622e88a071d3050370c64ace946 (patch) | |
| tree | b082adf321464c7cca0ada76fc36bdf223cc4d8b /OpenSim/Services/HypergridService/UserAgentService.cs | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-bb447581795cb622e88a071d3050370c64ace946.zip opensim-SC_OLD-bb447581795cb622e88a071d3050370c64ace946.tar.gz opensim-SC_OLD-bb447581795cb622e88a071d3050370c64ace946.tar.bz2 opensim-SC_OLD-bb447581795cb622e88a071d3050370c64ace946.tar.xz | |
Switched to using the other Util function with a default value.
Diffstat (limited to '')
| -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 64367c0..737e9c9 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", "Hypergrid", "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); |