diff options
| author | Melanie | 2013-02-23 20:37:09 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-23 20:37:09 +0000 |
| commit | e3ea2c4beefb65ba997beab1509aa996a46f7864 (patch) | |
| tree | 778cba450e788b13f4d000c6e49f3d94bd25f65c /OpenSim/Services/LLLoginService | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | More clarification on the [Groups] section (diff) | |
| download | opensim-SC_OLD-e3ea2c4beefb65ba997beab1509aa996a46f7864.zip opensim-SC_OLD-e3ea2c4beefb65ba997beab1509aa996a46f7864.tar.gz opensim-SC_OLD-e3ea2c4beefb65ba997beab1509aa996a46f7864.tar.bz2 opensim-SC_OLD-e3ea2c4beefb65ba997beab1509aa996a46f7864.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
Diffstat (limited to 'OpenSim/Services/LLLoginService')
| -rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 88e9eef..67f26c8 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
| @@ -110,7 +110,7 @@ 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 = Util.GetConfigVarWithDefaultSection(config, "GatekeeperURI", "LoginService"); | 113 | m_GatekeeperURL = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", new string[] {"Startup", "LoginService"}); |
| 114 | m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty); | 114 | m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty); |
| 115 | m_ProfileURL = m_LoginServerConfig.GetString("ProfileServerURL", string.Empty); | 115 | m_ProfileURL = m_LoginServerConfig.GetString("ProfileServerURL", string.Empty); |
| 116 | m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", String.Empty); | 116 | m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", String.Empty); |