diff options
| author | Melanie | 2013-02-28 21:20:07 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-28 21:20:07 +0000 |
| commit | eb9458fd7e3a9098712f501cdcf05d71f741ec14 (patch) | |
| tree | 1a719b0d89f22cefd04866db162694d0eb724d8d /OpenSim/Services/HypergridService/UserAgentService.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix potential concurrency issue since the LSL notecard cache was not being ch... (diff) | |
| download | opensim-SC-eb9458fd7e3a9098712f501cdcf05d71f741ec14.zip opensim-SC-eb9458fd7e3a9098712f501cdcf05d71f741ec14.tar.gz opensim-SC-eb9458fd7e3a9098712f501cdcf05d71f741ec14.tar.bz2 opensim-SC-eb9458fd7e3a9098712f501cdcf05d71f741ec14.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
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 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); |