diff options
author | Melanie | 2010-08-07 22:24:17 +0100 |
---|---|---|
committer | Melanie | 2010-08-07 22:24:17 +0100 |
commit | 4c5788c4c0975dbf3af58e2184a90965fcf0e893 (patch) | |
tree | 6a00001521ccae6c9fe23cf9a4f47ca75b3515cd /OpenSim/Services/LLLoginService/LLLoginService.cs | |
parent | Dumb error in fix (diff) | |
download | opensim-SC_OLD-4c5788c4c0975dbf3af58e2184a90965fcf0e893.zip opensim-SC_OLD-4c5788c4c0975dbf3af58e2184a90965fcf0e893.tar.gz opensim-SC_OLD-4c5788c4c0975dbf3af58e2184a90965fcf0e893.tar.bz2 opensim-SC_OLD-4c5788c4c0975dbf3af58e2184a90965fcf0e893.tar.xz |
Add search URL to Login Service
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 9446126..f9fe7f0 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -74,6 +74,7 @@ namespace OpenSim.Services.LLLoginService | |||
74 | protected string m_GatekeeperURL; | 74 | protected string m_GatekeeperURL; |
75 | protected bool m_AllowRemoteSetLoginLevel; | 75 | protected bool m_AllowRemoteSetLoginLevel; |
76 | protected string m_MapTileURL; | 76 | protected string m_MapTileURL; |
77 | protected string m_SearchURL; | ||
77 | 78 | ||
78 | IConfig m_LoginServerConfig; | 79 | IConfig m_LoginServerConfig; |
79 | 80 | ||
@@ -102,6 +103,7 @@ namespace OpenSim.Services.LLLoginService | |||
102 | m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0); | 103 | m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0); |
103 | m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty); | 104 | m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty); |
104 | m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty); | 105 | m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty); |
106 | m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty); | ||
105 | 107 | ||
106 | // These are required; the others aren't | 108 | // These are required; the others aren't |
107 | if (accountService == string.Empty || authService == string.Empty) | 109 | if (accountService == string.Empty || authService == string.Empty) |
@@ -364,7 +366,7 @@ namespace OpenSim.Services.LLLoginService | |||
364 | // Finally, fill out the response and return it | 366 | // Finally, fill out the response and return it |
365 | // | 367 | // |
366 | LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, | 368 | LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, |
367 | where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL); | 369 | where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL, m_SearchURL); |
368 | 370 | ||
369 | m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client."); | 371 | m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client."); |
370 | return response; | 372 | return response; |