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
             return accounts;
         }
 
+<<<<<<< HEAD
         public void InvalidateCache(UUID userID)
         {
+=======
+        public List<UserAccount> GetUserAccountsWhere(UUID scopeID, string where)
+        {
+            return null; // Not implemented for regions
+>>>>>>> avn/ubitvar
         }
 
         public virtual bool StoreUserAccount(UserAccount data)