diff options
author | Diva Canto | 2010-07-02 06:36:08 -0700 |
---|---|---|
committer | Diva Canto | 2010-07-02 06:36:08 -0700 |
commit | 79c1eb1e394c658bf2f0af0f1e20a9c5f8ea1b53 (patch) | |
tree | 94689bae9d0813616dc9f487824d17d8954f0414 /OpenSim/Services/LLLoginService/LLLoginService.cs | |
parent | Fixes mantis #4782 (diff) | |
parent | Clean up IMoneyModule and adjust the other modules to the changes (diff) | |
download | opensim-SC_OLD-79c1eb1e394c658bf2f0af0f1e20a9c5f8ea1b53.zip opensim-SC_OLD-79c1eb1e394c658bf2f0af0f1e20a9c5f8ea1b53.tar.gz opensim-SC_OLD-79c1eb1e394c658bf2f0af0f1e20a9c5f8ea1b53.tar.bz2 opensim-SC_OLD-79c1eb1e394c658bf2f0af0f1e20a9c5f8ea1b53.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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 00fffff..f4e045c 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -73,6 +73,7 @@ namespace OpenSim.Services.LLLoginService | |||
73 | protected int m_MinLoginLevel; | 73 | protected int m_MinLoginLevel; |
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 | 77 | ||
77 | IConfig m_LoginServerConfig; | 78 | IConfig m_LoginServerConfig; |
78 | 79 | ||
@@ -100,6 +101,7 @@ namespace OpenSim.Services.LLLoginService | |||
100 | m_AllowRemoteSetLoginLevel = m_LoginServerConfig.GetBoolean("AllowRemoteSetLoginLevel", false); | 101 | m_AllowRemoteSetLoginLevel = m_LoginServerConfig.GetBoolean("AllowRemoteSetLoginLevel", false); |
101 | m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0); | 102 | m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0); |
102 | m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty); | 103 | m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty); |
104 | m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty); | ||
103 | 105 | ||
104 | // These are required; the others aren't | 106 | // These are required; the others aren't |
105 | if (accountService == string.Empty || authService == string.Empty) | 107 | if (accountService == string.Empty || authService == string.Empty) |
@@ -356,7 +358,7 @@ namespace OpenSim.Services.LLLoginService | |||
356 | // Finally, fill out the response and return it | 358 | // Finally, fill out the response and return it |
357 | // | 359 | // |
358 | LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, | 360 | LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, |
359 | where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP); | 361 | where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL); |
360 | 362 | ||
361 | m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client."); | 363 | m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client."); |
362 | return response; | 364 | return response; |