diff options
author | Justin Clark-Casey (justincc) | 2010-03-12 19:31:14 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-03-12 19:31:14 +0000 |
commit | f2de50bb14bd8215ea98c79c79aabe1e6b4f2780 (patch) | |
tree | a234ef918308290b8d9db829f392ce646b7f2c06 /OpenSim/Services | |
parent | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-f2de50bb14bd8215ea98c79c79aabe1e6b4f2780.zip opensim-SC-f2de50bb14bd8215ea98c79c79aabe1e6b4f2780.tar.gz opensim-SC-f2de50bb14bd8215ea98c79c79aabe1e6b4f2780.tar.bz2 opensim-SC-f2de50bb14bd8215ea98c79c79aabe1e6b4f2780.tar.xz |
Fix tests broken in 88771aeed3d45e60a18aa9a810eeb37b8e5def12
Adds MockUserAccountService and connects it up
Stops services being carried over between tests since this leads to hard to find bugs
Improves information and error reporting when loading plugins
Diffstat (limited to 'OpenSim/Services')
-rw-r--r-- | OpenSim/Services/Interfaces/IUserAccountService.cs | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/OpenSim/Services/Interfaces/IUserAccountService.cs b/OpenSim/Services/Interfaces/IUserAccountService.cs index 3dacf53..a45bf8c 100644 --- a/OpenSim/Services/Interfaces/IUserAccountService.cs +++ b/OpenSim/Services/Interfaces/IUserAccountService.cs | |||
@@ -140,14 +140,20 @@ namespace OpenSim.Services.Interfaces | |||
140 | UserAccount GetUserAccount(UUID scopeID, UUID userID); | 140 | UserAccount GetUserAccount(UUID scopeID, UUID userID); |
141 | UserAccount GetUserAccount(UUID scopeID, string FirstName, string LastName); | 141 | UserAccount GetUserAccount(UUID scopeID, string FirstName, string LastName); |
142 | UserAccount GetUserAccount(UUID scopeID, string Email); | 142 | UserAccount GetUserAccount(UUID scopeID, string Email); |
143 | // Returns the list of avatars that matches both the search | 143 | |
144 | // criterion and the scope ID passed | 144 | /// <summary> |
145 | // | 145 | /// Returns the list of avatars that matches both the search criterion and the scope ID passed |
146 | /// </summary> | ||
147 | /// <param name="scopeID"></param> | ||
148 | /// <param name="query"></param> | ||
149 | /// <returns></returns> | ||
146 | List<UserAccount> GetUserAccounts(UUID scopeID, string query); | 150 | List<UserAccount> GetUserAccounts(UUID scopeID, string query); |
147 | 151 | ||
148 | // Store the data given, wich replaces the sotred data, therefore | 152 | /// <summary> |
149 | // must be complete. | 153 | /// Store the data given, wich replaces the sotred data, therefore must be complete. |
150 | // | 154 | /// </summary> |
155 | /// <param name="data"></param> | ||
156 | /// <returns></returns> | ||
151 | bool StoreUserAccount(UserAccount data); | 157 | bool StoreUserAccount(UserAccount data); |
152 | } | 158 | } |
153 | } | 159 | } \ No newline at end of file |