diff options
Diffstat (limited to 'OpenSim/Services/LLLoginService/LLLoginService.cs')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 5dff512..db8a9cb 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -74,6 +74,8 @@ 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_ProfileURL; | ||
78 | protected string m_OpenIDURL; | ||
77 | protected string m_SearchURL; | 79 | protected string m_SearchURL; |
78 | protected string m_Currency; | 80 | protected string m_Currency; |
79 | 81 | ||
@@ -108,6 +110,8 @@ namespace OpenSim.Services.LLLoginService | |||
108 | m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0); | 110 | m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0); |
109 | m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty); | 111 | m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty); |
110 | m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty); | 112 | m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty); |
113 | m_ProfileURL = m_LoginServerConfig.GetString("ProfileServerURL", string.Empty); | ||
114 | m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", String.Empty); | ||
111 | m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty); | 115 | m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty); |
112 | m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty); | 116 | m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty); |
113 | 117 | ||
@@ -413,7 +417,7 @@ namespace OpenSim.Services.LLLoginService | |||
413 | // Finally, fill out the response and return it | 417 | // Finally, fill out the response and return it |
414 | // | 418 | // |
415 | 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, |
416 | where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL, m_SearchURL, m_Currency); | 420 | where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency); |
417 | 421 | ||
418 | 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."); |
419 | return response; | 423 | return response; |
@@ -889,16 +893,16 @@ namespace OpenSim.Services.LLLoginService | |||
889 | private void RegisterCommands() | 893 | private void RegisterCommands() |
890 | { | 894 | { |
891 | //MainConsole.Instance.Commands.AddCommand | 895 | //MainConsole.Instance.Commands.AddCommand |
892 | MainConsole.Instance.Commands.AddCommand("loginservice", false, "login level", | 896 | MainConsole.Instance.Commands.AddCommand("Users", false, "login level", |
893 | "login level <level>", | 897 | "login level <level>", |
894 | "Set the minimum user level to log in", HandleLoginCommand); | 898 | "Set the minimum user level to log in", HandleLoginCommand); |
895 | 899 | ||
896 | MainConsole.Instance.Commands.AddCommand("loginservice", false, "login reset", | 900 | MainConsole.Instance.Commands.AddCommand("Users", false, "login reset", |
897 | "login reset", | 901 | "login reset", |
898 | "Reset the login level to allow all users", | 902 | "Reset the login level to allow all users", |
899 | HandleLoginCommand); | 903 | HandleLoginCommand); |
900 | 904 | ||
901 | MainConsole.Instance.Commands.AddCommand("loginservice", false, "login text", | 905 | MainConsole.Instance.Commands.AddCommand("Users", false, "login text", |
902 | "login text <text>", | 906 | "login text <text>", |
903 | "Set the text users will see on login", HandleLoginCommand); | 907 | "Set the text users will see on login", HandleLoginCommand); |
904 | 908 | ||