diff options
author | Diva Canto | 2010-03-05 21:36:45 -0800 |
---|---|---|
committer | Diva Canto | 2010-03-05 21:36:45 -0800 |
commit | 5171464ac199f958a9a8a11664958260a88e863d (patch) | |
tree | 97f70afe241e8761d496d5f54acb5e5eae8d7495 /OpenSim/Services/UserAccountService/GridUserServiceBase.cs | |
parent | refactor: Move DetachSingleAttachmentToInv to region module (diff) | |
download | opensim-SC-5171464ac199f958a9a8a11664958260a88e863d.zip opensim-SC-5171464ac199f958a9a8a11664958260a88e863d.tar.gz opensim-SC-5171464ac199f958a9a8a11664958260a88e863d.tar.bz2 opensim-SC-5171464ac199f958a9a8a11664958260a88e863d.tar.xz |
Justin, I must have been dyslexic when I wrote UserGridService as the name for it. GridUserService makes more sense; it's the user of the grid, "grid user". I changed it everywhere.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/UserAccountService/GridUserServiceBase.cs (renamed from OpenSim/Services/UserAccountService/UserGridServiceBase.cs) | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Services/UserAccountService/UserGridServiceBase.cs b/OpenSim/Services/UserAccountService/GridUserServiceBase.cs index 80aaa49..990cb63 100644 --- a/OpenSim/Services/UserAccountService/UserGridServiceBase.cs +++ b/OpenSim/Services/UserAccountService/GridUserServiceBase.cs | |||
@@ -35,15 +35,15 @@ using OpenSim.Services.Base; | |||
35 | 35 | ||
36 | namespace OpenSim.Services.UserAccountService | 36 | namespace OpenSim.Services.UserAccountService |
37 | { | 37 | { |
38 | public class UserGridServiceBase : ServiceBase | 38 | public class GridUserServiceBase : ServiceBase |
39 | { | 39 | { |
40 | protected IUserGridData m_Database = null; | 40 | protected IGridUserData m_Database = null; |
41 | 41 | ||
42 | public UserGridServiceBase(IConfigSource config) : base(config) | 42 | public GridUserServiceBase(IConfigSource config) : base(config) |
43 | { | 43 | { |
44 | string dllName = String.Empty; | 44 | string dllName = String.Empty; |
45 | string connString = String.Empty; | 45 | string connString = String.Empty; |
46 | string realm = "UserGrid"; | 46 | string realm = "GridUser"; |
47 | 47 | ||
48 | // | 48 | // |
49 | // Try reading the [DatabaseService] section, if it exists | 49 | // Try reading the [DatabaseService] section, if it exists |
@@ -58,9 +58,9 @@ namespace OpenSim.Services.UserAccountService | |||
58 | } | 58 | } |
59 | 59 | ||
60 | // | 60 | // |
61 | // [PresenceService] section overrides [DatabaseService], if it exists | 61 | // [GridUsetService] section overrides [DatabaseService], if it exists |
62 | // | 62 | // |
63 | IConfig presenceConfig = config.Configs["PresenceService"]; | 63 | IConfig presenceConfig = config.Configs["GridUserService"]; |
64 | if (presenceConfig != null) | 64 | if (presenceConfig != null) |
65 | { | 65 | { |
66 | dllName = presenceConfig.GetString("StorageProvider", dllName); | 66 | dllName = presenceConfig.GetString("StorageProvider", dllName); |
@@ -74,7 +74,7 @@ namespace OpenSim.Services.UserAccountService | |||
74 | if (dllName.Equals(String.Empty)) | 74 | if (dllName.Equals(String.Empty)) |
75 | throw new Exception("No StorageProvider configured"); | 75 | throw new Exception("No StorageProvider configured"); |
76 | 76 | ||
77 | m_Database = LoadPlugin<IUserGridData>(dllName, new Object[] { connString, realm }); | 77 | m_Database = LoadPlugin<IGridUserData>(dllName, new Object[] { connString, realm }); |
78 | if (m_Database == null) | 78 | if (m_Database == null) |
79 | throw new Exception("Could not find a storage interface in the given module " + dllName); | 79 | throw new Exception("Could not find a storage interface in the given module " + dllName); |
80 | } | 80 | } |