diff options
| author | Justin Clark-Casey (justincc) | 2010-09-04 01:38:11 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-09-04 01:38:11 +0100 |
| commit | c0b16f09bfc4f0c2aeabb7c6315f1124f8b08974 (patch) | |
| tree | 9e0db9a67ff4b8c9a8c1d938f6407bcee0f7cb42 /OpenSim/Services | |
| parent | Move code that allows llGiveInvetory() to move item into appropriate system f... (diff) | |
| parent | Added XFF header processing. Untested, for lack of proxy. (diff) | |
| download | opensim-SC_OLD-c0b16f09bfc4f0c2aeabb7c6315f1124f8b08974.zip opensim-SC_OLD-c0b16f09bfc4f0c2aeabb7c6315f1124f8b08974.tar.gz opensim-SC_OLD-c0b16f09bfc4f0c2aeabb7c6315f1124f8b08974.tar.bz2 opensim-SC_OLD-c0b16f09bfc4f0c2aeabb7c6315f1124f8b08974.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services')
| -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 b740297..3f9bc19 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
| @@ -104,7 +104,7 @@ namespace OpenSim.Services.LLLoginService | |||
| 104 | m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty); | 104 | m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty); |
| 105 | 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); | 106 | m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty); |
| 107 | 107 | ||
| 108 | // These are required; the others aren't | 108 | // These are required; the others aren't |
| 109 | if (accountService == string.Empty || authService == string.Empty) | 109 | if (accountService == string.Empty || authService == string.Empty) |
| 110 | throw new Exception("LoginService is missing service specifications"); | 110 | throw new Exception("LoginService is missing service specifications"); |