diff options
| author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
| commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
| tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs | |
| parent | remove lixo (diff) | |
| parent | dont change camera on crossings (diff) | |
| download | opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz | |
bad merge?
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs')
| -rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs index 698c4c0..08c5c50 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs | |||
| @@ -191,9 +191,15 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
| 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 | { |
| 196 | m_accountCache.Remove(userID); | 197 | m_accountCache.Remove(userID); |
| 198 | ======= | ||
| 199 | public List<UserAccount> GetUserAccountsWhere(UUID scopeID, string query) | ||
| 200 | { | ||
| 201 | return null; | ||
| 202 | >>>>>>> avn/ubitvar | ||
| 197 | } | 203 | } |
| 198 | 204 | ||
| 199 | public bool StoreUserAccount(UserAccount data) | 205 | public bool StoreUserAccount(UserAccount data) |