diff options
Diffstat (limited to 'OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs b/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs index 560e6c4..e5fb5a8 100644 --- a/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs +++ b/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs | |||
@@ -191,8 +191,14 @@ namespace OpenSim.Services.Connectors | |||
191 | return accounts; | 191 | return accounts; |
192 | } | 192 | } |
193 | 193 | ||
194 | <<<<<<< HEAD | ||
194 | public void InvalidateCache(UUID userID) | 195 | public void InvalidateCache(UUID userID) |
195 | { | 196 | { |
197 | ======= | ||
198 | public List<UserAccount> GetUserAccountsWhere(UUID scopeID, string where) | ||
199 | { | ||
200 | return null; // Not implemented for regions | ||
201 | >>>>>>> avn/ubitvar | ||
196 | } | 202 | } |
197 | 203 | ||
198 | public virtual bool StoreUserAccount(UserAccount data) | 204 | public virtual bool StoreUserAccount(UserAccount data) |