aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Servers/User
diff options
context:
space:
mode:
authorMelanie Thielker2009-05-11 22:54:09 +0000
committerMelanie Thielker2009-05-11 22:54:09 +0000
commit16efb78698fc505fb33ad87962b39047939d636c (patch)
treeb5a52ac4bb450bec6a8f6e52a5a7e97db1335488 /OpenSim/Servers/User
parentresolve a circular dependency (diff)
downloadopensim-SC_OLD-16efb78698fc505fb33ad87962b39047939d636c.zip
opensim-SC_OLD-16efb78698fc505fb33ad87962b39047939d636c.tar.gz
opensim-SC_OLD-16efb78698fc505fb33ad87962b39047939d636c.tar.bz2
opensim-SC_OLD-16efb78698fc505fb33ad87962b39047939d636c.tar.xz
Changes to the new user system to add the modularity developed for the asset
system
Diffstat (limited to 'OpenSim/Servers/User')
-rw-r--r--OpenSim/Servers/User/UserServerConnector.cs17
1 files changed, 15 insertions, 2 deletions
diff --git a/OpenSim/Servers/User/UserServerConnector.cs b/OpenSim/Servers/User/UserServerConnector.cs
index c20cc31..15b09bc 100644
--- a/OpenSim/Servers/User/UserServerConnector.cs
+++ b/OpenSim/Servers/User/UserServerConnector.cs
@@ -25,9 +25,10 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
28using Nini.Config; 29using Nini.Config;
30using OpenSim.Servers.Base;
29using OpenSim.Services.Interfaces; 31using OpenSim.Services.Interfaces;
30using OpenSim.Services.UserService;
31using OpenSim.Framework.Servers.HttpServer; 32using OpenSim.Framework.Servers.HttpServer;
32 33
33namespace OpenSim.Servers.UserServer 34namespace OpenSim.Servers.UserServer
@@ -38,7 +39,19 @@ namespace OpenSim.Servers.UserServer
38 39
39 public UserServiceConnector(IConfigSource config, IHttpServer server) 40 public UserServiceConnector(IConfigSource config, IHttpServer server)
40 { 41 {
41 m_UserService = new UserService(config); 42 IConfig serverConfig = config.Configs["UserService"];
43 if (serverConfig == null)
44 throw new Exception("No section 'Server' in config file");
45
46 string userService = serverConfig.GetString("LocalServiceModule",
47 String.Empty);
48
49 if (userService == String.Empty)
50 throw new Exception("No UserService in config file");
51
52 Object[] args = new Object[] { config };
53 m_UserService =
54 ServerUtils.LoadPlugin<IUserService>(userService, args);
42 } 55 }
43 } 56 }
44} 57}