From 88d2df597e499600357c86ad0b1a755a13e9c6b1 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Tue, 29 Dec 2009 16:34:02 -0800 Subject: * Fixed names. * Added configs for Standalone * Changed UserSericeBase to use useraccounts instead of user --- OpenSim/Services/UserService/UserServiceBase.cs | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'OpenSim/Services/UserService/UserServiceBase.cs') diff --git a/OpenSim/Services/UserService/UserServiceBase.cs b/OpenSim/Services/UserService/UserServiceBase.cs index fea8b01..70ed594 100644 --- a/OpenSim/Services/UserService/UserServiceBase.cs +++ b/OpenSim/Services/UserService/UserServiceBase.cs @@ -40,20 +40,29 @@ namespace OpenSim.Services.UserAccountService public UserAccountServiceBase(IConfigSource config) : base(config) { + string dllName = String.Empty; + string connString = String.Empty; + string realm = "useraccounts"; + + IConfig dbConfig = config.Configs["DatabaseService"]; + if (dbConfig != null) + { + dllName = dbConfig.GetString("StorageProvider", String.Empty); + connString = dbConfig.GetString("ConnectionString", String.Empty); + } + IConfig userConfig = config.Configs["UserAccountService"]; if (userConfig == null) throw new Exception("No UserAccountService configuration"); - string dllName = userConfig.GetString("StorageProvider", - String.Empty); + dllName = userConfig.GetString("StorageProvider", dllName); if (dllName == String.Empty) throw new Exception("No StorageProvider configured"); - string connString = userConfig.GetString("ConnectionString", - String.Empty); + connString = userConfig.GetString("ConnectionString", connString); - string realm = userConfig.GetString("Realm", "users"); + realm = userConfig.GetString("Realm", realm); m_Database = LoadPlugin(dllName, new Object[] {connString, realm}); -- cgit v1.1