diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/UserService/UserService.cs | 18 | ||||
-rw-r--r-- | OpenSim/Services/UserService/UserServiceBase.cs | 10 |
2 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Services/UserService/UserService.cs b/OpenSim/Services/UserService/UserService.cs index cfbc2c1..78793657 100644 --- a/OpenSim/Services/UserService/UserService.cs +++ b/OpenSim/Services/UserService/UserService.cs | |||
@@ -33,41 +33,41 @@ using OpenSim.Services.Interfaces; | |||
33 | using System.Collections.Generic; | 33 | using System.Collections.Generic; |
34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
35 | 35 | ||
36 | namespace OpenSim.Services.UserService | 36 | namespace OpenSim.Services.UserAccountService |
37 | { | 37 | { |
38 | public class UserService : UserServiceBase, IUserDataService | 38 | public class UserAccountService : UserAccountServiceBase, IUserAccountDataService |
39 | { | 39 | { |
40 | public UserService(IConfigSource config) : base(config) | 40 | public UserAccountService(IConfigSource config) : base(config) |
41 | { | 41 | { |
42 | } | 42 | } |
43 | 43 | ||
44 | public UserData GetUserData(UUID scopeID, string firstName, | 44 | public UserAccountData GetUserAccountData(UUID scopeID, string firstName, |
45 | string lastName) | 45 | string lastName) |
46 | { | 46 | { |
47 | return null; | 47 | return null; |
48 | } | 48 | } |
49 | 49 | ||
50 | public UserData GetUserData(UUID scopeID, UUID userID) | 50 | public UserAccountData GetUserAccountData(UUID scopeID, UUID userID) |
51 | { | 51 | { |
52 | return null; | 52 | return null; |
53 | } | 53 | } |
54 | 54 | ||
55 | public bool SetHomePosition(UserData data, UUID regionID, UUID regionSecret) | 55 | public bool SetHomePosition(UserAccountData data, UUID regionID, UUID regionSecret) |
56 | { | 56 | { |
57 | return false; | 57 | return false; |
58 | } | 58 | } |
59 | 59 | ||
60 | public bool SetUserData(UserData data, UUID principalID, UUID sessionID) | 60 | public bool SetUserAccountData(UserAccountData data, UUID principalID, UUID sessionID) |
61 | { | 61 | { |
62 | return false; | 62 | return false; |
63 | } | 63 | } |
64 | 64 | ||
65 | public bool CreateUserData(UserData data, UUID principalID, UUID sessionID) | 65 | public bool CreateUserAccountData(UserAccountData data, UUID principalID, UUID sessionID) |
66 | { | 66 | { |
67 | return false; | 67 | return false; |
68 | } | 68 | } |
69 | 69 | ||
70 | public List<UserData> GetAvatarPickerData(UUID scopeID, | 70 | public List<UserAccountData> GetUserAccountData(UUID scopeID, |
71 | string query) | 71 | string query) |
72 | { | 72 | { |
73 | return null; | 73 | return null; |
diff --git a/OpenSim/Services/UserService/UserServiceBase.cs b/OpenSim/Services/UserService/UserServiceBase.cs index 5139e50..c982c1a 100644 --- a/OpenSim/Services/UserService/UserServiceBase.cs +++ b/OpenSim/Services/UserService/UserServiceBase.cs | |||
@@ -32,17 +32,17 @@ using OpenSim.Data; | |||
32 | using OpenSim.Services.Interfaces; | 32 | using OpenSim.Services.Interfaces; |
33 | using OpenSim.Services.Base; | 33 | using OpenSim.Services.Base; |
34 | 34 | ||
35 | namespace OpenSim.Services.UserService | 35 | namespace OpenSim.Services.UserAccountService |
36 | { | 36 | { |
37 | public class UserServiceBase: ServiceBase | 37 | public class UserAccountServiceBase: ServiceBase |
38 | { | 38 | { |
39 | protected IUserDataPlugin m_Database = null; | 39 | protected IUserDataPlugin m_Database = null; |
40 | 40 | ||
41 | public UserServiceBase(IConfigSource config) : base(config) | 41 | public UserAccountServiceBase(IConfigSource config) : base(config) |
42 | { | 42 | { |
43 | IConfig userConfig = config.Configs["UserService"]; | 43 | IConfig userConfig = config.Configs["UserAccountService"]; |
44 | if (userConfig == null) | 44 | if (userConfig == null) |
45 | throw new Exception("No UserService configuration"); | 45 | throw new Exception("No UserAccountService configuration"); |
46 | 46 | ||
47 | string dllName = userConfig.GetString("StorageProvider", | 47 | string dllName = userConfig.GetString("StorageProvider", |
48 | String.Empty); | 48 | String.Empty); |