diff options
author | BlueWall | 2012-02-22 16:36:28 -0500 |
---|---|---|
committer | BlueWall | 2012-02-22 16:36:28 -0500 |
commit | 165ae251ec132da30dc58513101e4ec438df8d2f (patch) | |
tree | d386b1c837aca876a7573a9297f95758a8714cf8 /OpenSim/Services/LLLoginService/LLLoginService.cs | |
parent | Add web profile url setting to ini (diff) | |
download | opensim-SC_OLD-165ae251ec132da30dc58513101e4ec438df8d2f.zip opensim-SC_OLD-165ae251ec132da30dc58513101e4ec438df8d2f.tar.gz opensim-SC_OLD-165ae251ec132da30dc58513101e4ec438df8d2f.tar.bz2 opensim-SC_OLD-165ae251ec132da30dc58513101e4ec438df8d2f.tar.xz |
V3 Support
The V3 webapps need SSO capability and use OpenID. We need to send both our OpenID server url and a token for the user in the login response.
Diffstat (limited to 'OpenSim/Services/LLLoginService/LLLoginService.cs')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 02e62c8..f7b38d4 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -75,6 +75,7 @@ namespace OpenSim.Services.LLLoginService | |||
75 | protected bool m_AllowRemoteSetLoginLevel; | 75 | protected bool m_AllowRemoteSetLoginLevel; |
76 | protected string m_MapTileURL; | 76 | protected string m_MapTileURL; |
77 | protected string m_ProfileURL; | 77 | protected string m_ProfileURL; |
78 | protected string m_OpenIDURL; | ||
78 | protected string m_SearchURL; | 79 | protected string m_SearchURL; |
79 | protected string m_Currency; | 80 | protected string m_Currency; |
80 | 81 | ||
@@ -110,6 +111,7 @@ namespace OpenSim.Services.LLLoginService | |||
110 | m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty); | 111 | m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty); |
111 | m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty); | 112 | m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty); |
112 | m_ProfileURL = m_LoginServerConfig.GetString("ProfileServerURL", string.Empty); | 113 | m_ProfileURL = m_LoginServerConfig.GetString("ProfileServerURL", string.Empty); |
114 | m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", String.Empty); | ||
113 | m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty); | 115 | m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty); |
114 | m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty); | 116 | m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty); |
115 | 117 | ||
@@ -415,7 +417,7 @@ namespace OpenSim.Services.LLLoginService | |||
415 | // Finally, fill out the response and return it | 417 | // Finally, fill out the response and return it |
416 | // | 418 | // |
417 | LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, | 419 | LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, |
418 | where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL, m_ProfileURL, m_SearchURL, m_Currency); | 420 | where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency); |
419 | 421 | ||
420 | m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client."); | 422 | m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client."); |
421 | return response; | 423 | return response; |