diff options
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r-- | OpenSim/Grid/UserServer/Main.cs | 4 | ||||
-rw-r--r-- | OpenSim/Grid/UserServer/UserLoginService.cs | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index 6e3ccb7..d50558f 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs | |||
@@ -31,6 +31,7 @@ using System.Collections.Generic; | |||
31 | using System.IO; | 31 | using System.IO; |
32 | using libsecondlife; | 32 | using libsecondlife; |
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using OpenSim.Framework.Communications.Cache; | ||
34 | using OpenSim.Framework.Console; | 35 | using OpenSim.Framework.Console; |
35 | using OpenSim.Framework.Servers; | 36 | using OpenSim.Framework.Servers; |
36 | 37 | ||
@@ -89,7 +90,8 @@ namespace OpenSim.Grid.UserServer | |||
89 | m_userManager._config = Cfg; | 90 | m_userManager._config = Cfg; |
90 | m_userManager.AddPlugin(Cfg.DatabaseProvider); | 91 | m_userManager.AddPlugin(Cfg.DatabaseProvider); |
91 | 92 | ||
92 | m_loginService = new UserLoginService(m_userManager, Cfg, Cfg.DefaultStartupMsg); | 93 | m_loginService = new UserLoginService( |
94 | m_userManager, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg); | ||
93 | 95 | ||
94 | MainLog.Instance.Verbose("REGION", "Starting HTTP process"); | 96 | MainLog.Instance.Verbose("REGION", "Starting HTTP process"); |
95 | BaseHttpServer httpServer = new BaseHttpServer(Cfg.HttpPort); | 97 | BaseHttpServer httpServer = new BaseHttpServer(Cfg.HttpPort); |
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index 0eb2db1..1a3bf2e 100644 --- a/OpenSim/Grid/UserServer/UserLoginService.cs +++ b/OpenSim/Grid/UserServer/UserLoginService.cs | |||
@@ -32,7 +32,9 @@ using System.Collections.Generic; | |||
32 | using System.Threading; | 32 | using System.Threading; |
33 | using libsecondlife; | 33 | using libsecondlife; |
34 | using Nwc.XmlRpc; | 34 | using Nwc.XmlRpc; |
35 | |||
35 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
37 | using OpenSim.Framework.Communications.Cache; | ||
36 | using OpenSim.Framework.Console; | 38 | using OpenSim.Framework.Console; |
37 | using OpenSim.Framework.Data; | 39 | using OpenSim.Framework.Data; |
38 | using OpenSim.Framework.Servers; | 40 | using OpenSim.Framework.Servers; |
@@ -45,8 +47,9 @@ namespace OpenSim.Grid.UserServer | |||
45 | { | 47 | { |
46 | public UserConfig m_config; | 48 | public UserConfig m_config; |
47 | 49 | ||
48 | public UserLoginService(UserManagerBase userManager, UserConfig config, string welcomeMess) | 50 | public UserLoginService( |
49 | : base(userManager, welcomeMess) | 51 | UserManagerBase userManager, LibraryRootFolder libraryRootFolder, UserConfig config, string welcomeMess) |
52 | : base(userManager, libraryRootFolder, welcomeMess) | ||
50 | { | 53 | { |
51 | m_config = config; | 54 | m_config = config; |
52 | } | 55 | } |