diff options
author | Teravus Ovares (Dan Olivares) | 2009-09-06 16:15:20 -0400 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-09-06 16:15:20 -0400 |
commit | 8797a8209829c0a3fe7ff9edbe46e2d636a546a8 (patch) | |
tree | e0637dd04b59f4387e160e9d26887d94904588d8 /OpenSim/Services/UserService/UserServiceBase.cs | |
parent | * Moves another Legacy avatar inbounds check to Border (diff) | |
parent | Addendum to last commit. With the last commit, some other code that should (diff) | |
download | opensim-SC-8797a8209829c0a3fe7ff9edbe46e2d636a546a8.zip opensim-SC-8797a8209829c0a3fe7ff9edbe46e2d636a546a8.tar.gz opensim-SC-8797a8209829c0a3fe7ff9edbe46e2d636a546a8.tar.bz2 opensim-SC-8797a8209829c0a3fe7ff9edbe46e2d636a546a8.tar.xz |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Services/UserService/UserServiceBase.cs')
-rw-r--r-- | OpenSim/Services/UserService/UserServiceBase.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Services/UserService/UserServiceBase.cs b/OpenSim/Services/UserService/UserServiceBase.cs index c982c1a..fea8b01 100644 --- a/OpenSim/Services/UserService/UserServiceBase.cs +++ b/OpenSim/Services/UserService/UserServiceBase.cs | |||
@@ -36,7 +36,7 @@ namespace OpenSim.Services.UserAccountService | |||
36 | { | 36 | { |
37 | public class UserAccountServiceBase: ServiceBase | 37 | public class UserAccountServiceBase: ServiceBase |
38 | { | 38 | { |
39 | protected IUserDataPlugin m_Database = null; | 39 | protected IUserAccountData m_Database = null; |
40 | 40 | ||
41 | public UserAccountServiceBase(IConfigSource config) : base(config) | 41 | public UserAccountServiceBase(IConfigSource config) : base(config) |
42 | { | 42 | { |
@@ -53,12 +53,12 @@ namespace OpenSim.Services.UserAccountService | |||
53 | string connString = userConfig.GetString("ConnectionString", | 53 | string connString = userConfig.GetString("ConnectionString", |
54 | String.Empty); | 54 | String.Empty); |
55 | 55 | ||
56 | m_Database = LoadPlugin<IUserDataPlugin>(dllName); | 56 | string realm = userConfig.GetString("Realm", "users"); |
57 | |||
58 | m_Database = LoadPlugin<IUserAccountData>(dllName, new Object[] {connString, realm}); | ||
57 | 59 | ||
58 | if (m_Database == null) | 60 | if (m_Database == null) |
59 | throw new Exception("Could not find a storage interface in the given module"); | 61 | throw new Exception("Could not find a storage interface in the given module"); |
60 | |||
61 | m_Database.Initialise(connString); | ||
62 | } | 62 | } |
63 | } | 63 | } |
64 | } | 64 | } |