diff options
| author | Diva Canto | 2013-02-27 20:49:41 -0800 |
|---|---|---|
| committer | Diva Canto | 2013-02-27 20:49:41 -0800 |
| commit | f1010d7b152b68e2961b40482006221e28e976af (patch) | |
| tree | 6872908b7161842ff6e1db4c23acd39de82b2fbd /OpenSim/Services/HypergridService/UserAgentService.cs | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-f1010d7b152b68e2961b40482006221e28e976af.zip opensim-SC_OLD-f1010d7b152b68e2961b40482006221e28e976af.tar.gz opensim-SC_OLD-f1010d7b152b68e2961b40482006221e28e976af.tar.bz2 opensim-SC_OLD-f1010d7b152b68e2961b40482006221e28e976af.tar.xz | |
Moved the HG default variables out of [Startup] and into their own section [Hypergrid] in *Common.ini.example. Backwards compatible for now.
Diffstat (limited to 'OpenSim/Services/HypergridService/UserAgentService.cs')
| -rw-r--r-- | OpenSim/Services/HypergridService/UserAgentService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs index 2ab0b87..64367c0 100644 --- a/OpenSim/Services/HypergridService/UserAgentService.cs +++ b/OpenSim/Services/HypergridService/UserAgentService.cs | |||
| @@ -131,7 +131,7 @@ 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", new string[] { "Startup", "Hypergrid", "UserAgentService" }); |
| 135 | if (string.IsNullOrEmpty(m_GridName)) // Legacy. Remove soon. | 135 | if (string.IsNullOrEmpty(m_GridName)) // Legacy. Remove soon. |
| 136 | { | 136 | { |
| 137 | m_GridName = serverConfig.GetString("ExternalName", string.Empty); | 137 | m_GridName = serverConfig.GetString("ExternalName", string.Empty); |