diff options
| author | Melanie | 2011-11-28 11:06:38 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-28 11:06:38 +0000 |
| commit | dc612d0f08ff8740c1942270f22eb79f0310c8fd (patch) | |
| tree | 4c621d499eecbc176c6eb28a4bad4f8f4872e7f5 /OpenSim/Services/LLLoginService | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-dc612d0f08ff8740c1942270f22eb79f0310c8fd.zip opensim-SC_OLD-dc612d0f08ff8740c1942270f22eb79f0310c8fd.tar.gz opensim-SC_OLD-dc612d0f08ff8740c1942270f22eb79f0310c8fd.tar.bz2 opensim-SC_OLD-dc612d0f08ff8740c1942270f22eb79f0310c8fd.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.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 35b43f4..035980d 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
| @@ -81,7 +81,7 @@ namespace OpenSim.Services.LLLoginService | |||
| 81 | protected string m_DeniedClients; | 81 | protected string m_DeniedClients; |
| 82 | 82 | ||
| 83 | IConfig m_LoginServerConfig; | 83 | IConfig m_LoginServerConfig; |
| 84 | IConfig m_ClientsConfig; | 84 | // IConfig m_ClientsConfig; |
| 85 | 85 | ||
| 86 | public LLLoginService(IConfigSource config, ISimulationService simService, ILibraryService libraryService) | 86 | public LLLoginService(IConfigSource config, ISimulationService simService, ILibraryService libraryService) |
| 87 | { | 87 | { |