diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 18 | ||||
-rw-r--r-- | OpenSim/Services/LLLoginService/Properties/AssemblyInfo.cs | 4 |
2 files changed, 17 insertions, 5 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index cbb6e6c..ede2353 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -110,7 +110,8 @@ namespace OpenSim.Services.LLLoginService | |||
110 | m_RequireInventory = m_LoginServerConfig.GetBoolean("RequireInventory", true); | 110 | m_RequireInventory = m_LoginServerConfig.GetBoolean("RequireInventory", true); |
111 | m_AllowRemoteSetLoginLevel = m_LoginServerConfig.GetBoolean("AllowRemoteSetLoginLevel", false); | 111 | m_AllowRemoteSetLoginLevel = m_LoginServerConfig.GetBoolean("AllowRemoteSetLoginLevel", false); |
112 | m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0); | 112 | m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0); |
113 | m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty); | 113 | m_GatekeeperURL = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", |
114 | new string[] { "Startup", "Hypergrid", "LoginService" }, String.Empty); | ||
114 | m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty); | 115 | m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty); |
115 | m_ProfileURL = m_LoginServerConfig.GetString("ProfileServerURL", string.Empty); | 116 | m_ProfileURL = m_LoginServerConfig.GetString("ProfileServerURL", string.Empty); |
116 | m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", String.Empty); | 117 | m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", String.Empty); |
@@ -969,14 +970,25 @@ namespace OpenSim.Services.LLLoginService | |||
969 | // or fixing critical issues | 970 | // or fixing critical issues |
970 | // | 971 | // |
971 | if (cmd.Length > 2) | 972 | if (cmd.Length > 2) |
972 | Int32.TryParse(cmd[2], out m_MinLoginLevel); | 973 | { |
974 | if (Int32.TryParse(cmd[2], out m_MinLoginLevel)) | ||
975 | MainConsole.Instance.OutputFormat("Set minimum login level to {0}", m_MinLoginLevel); | ||
976 | else | ||
977 | MainConsole.Instance.OutputFormat("ERROR: {0} is not a valid login level", cmd[2]); | ||
978 | } | ||
973 | break; | 979 | break; |
974 | case "reset": | 980 | |
981 | case "reset": | ||
975 | m_MinLoginLevel = 0; | 982 | m_MinLoginLevel = 0; |
983 | MainConsole.Instance.OutputFormat("Reset min login level to {0}", m_MinLoginLevel); | ||
976 | break; | 984 | break; |
985 | |||
977 | case "text": | 986 | case "text": |
978 | if (cmd.Length > 2) | 987 | if (cmd.Length > 2) |
988 | { | ||
979 | m_WelcomeMessage = cmd[2]; | 989 | m_WelcomeMessage = cmd[2]; |
990 | MainConsole.Instance.OutputFormat("Login welcome message set to '{0}'", m_WelcomeMessage); | ||
991 | } | ||
980 | break; | 992 | break; |
981 | } | 993 | } |
982 | } | 994 | } |
diff --git a/OpenSim/Services/LLLoginService/Properties/AssemblyInfo.cs b/OpenSim/Services/LLLoginService/Properties/AssemblyInfo.cs index 62c6e0f..0a6daee 100644 --- a/OpenSim/Services/LLLoginService/Properties/AssemblyInfo.cs +++ b/OpenSim/Services/LLLoginService/Properties/AssemblyInfo.cs | |||
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices; | |||
29 | // Build Number | 29 | // Build Number |
30 | // Revision | 30 | // Revision |
31 | // | 31 | // |
32 | [assembly: AssemblyVersion("0.7.5.*")] | 32 | [assembly: AssemblyVersion("0.7.6.*")] |
33 | [assembly: AssemblyFileVersion("1.0.0.0")] | 33 | |