diff options
| author | BlueWall | 2014-10-27 17:27:42 -0400 |
|---|---|---|
| committer | BlueWall | 2014-10-27 17:27:42 -0400 |
| commit | b46387091470f3d1465c05625a656228ca54fd61 (patch) | |
| tree | bf1dce79eda615246f32ec88b2df61a60a223cc4 /OpenSim/Services | |
| parent | Refresh OpenMetaverse libraries again at 0f4b361 but with Windows builds to s... (diff) | |
| download | opensim-SC_OLD-b46387091470f3d1465c05625a656228ca54fd61.zip opensim-SC_OLD-b46387091470f3d1465c05625a656228ca54fd61.tar.gz opensim-SC_OLD-b46387091470f3d1465c05625a656228ca54fd61.tar.bz2 opensim-SC_OLD-b46387091470f3d1465c05625a656228ca54fd61.tar.xz | |
Add hypergrid teleporting support to user profiles picks
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 8059652..b1aabe6 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
| @@ -945,6 +945,13 @@ namespace OpenSim.Services.LLLoginService | |||
| 945 | m_log.DebugFormat("[LLLOGIN SERVICE]: found new key {0} {1}", keyName, aCircuit.ServiceURLs[keyName]); | 945 | m_log.DebugFormat("[LLLOGIN SERVICE]: found new key {0} {1}", keyName, aCircuit.ServiceURLs[keyName]); |
| 946 | } | 946 | } |
| 947 | 947 | ||
| 948 | if (!account.ServiceURLs.ContainsKey("GatekeeperURI") && !string.IsNullOrEmpty(m_GatekeeperURL)) | ||
| 949 | { | ||
| 950 | m_log.DebugFormat("[LLLOGIN SERVICE]: adding gatekeeper uri {0}", m_GatekeeperURL); | ||
| 951 | account.ServiceURLs["GatekeeperURI"] = m_GatekeeperURL; | ||
| 952 | newUrls = true; | ||
| 953 | } | ||
| 954 | |||
| 948 | // The grid operator decided to override the defaults in the | 955 | // The grid operator decided to override the defaults in the |
| 949 | // [LoginService] configuration. Let's store the correct ones. | 956 | // [LoginService] configuration. Let's store the correct ones. |
| 950 | if (newUrls) | 957 | if (newUrls) |