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