diff options
author | Jonathan Freedman | 2010-10-05 14:17:18 -0400 |
---|---|---|
committer | Jonathan Freedman | 2010-10-05 14:17:18 -0400 |
commit | 8f1acb890ac49ea004bf43065ce8d3472bb27708 (patch) | |
tree | 07e4e5fc77f764232c958bdbf8f93f2651da1663 /OpenSim/Services/Connectors/SimianGrid | |
parent | Merge branch 'master' of git://opensimulator.org/git/opensim (diff) | |
parent | Formatting cleanup. (diff) | |
download | opensim-SC_OLD-8f1acb890ac49ea004bf43065ce8d3472bb27708.zip opensim-SC_OLD-8f1acb890ac49ea004bf43065ce8d3472bb27708.tar.gz opensim-SC_OLD-8f1acb890ac49ea004bf43065ce8d3472bb27708.tar.bz2 opensim-SC_OLD-8f1acb890ac49ea004bf43065ce8d3472bb27708.tar.xz |
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs index ddd2322..9c150ee 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs | |||
@@ -147,7 +147,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
147 | if (account == null) | 147 | if (account == null) |
148 | { | 148 | { |
149 | // Store null responses too, to avoid repeated lookups for missing accounts | 149 | // Store null responses too, to avoid repeated lookups for missing accounts |
150 | m_accountCache.AddOrUpdate(userID, null, DateTime.Now + TimeSpan.FromSeconds(CACHE_EXPIRATION_SECONDS)); | 150 | m_accountCache.AddOrUpdate(userID, null, CACHE_EXPIRATION_SECONDS); |
151 | } | 151 | } |
152 | 152 | ||
153 | return account; | 153 | return account; |
@@ -225,7 +225,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
225 | if (success) | 225 | if (success) |
226 | { | 226 | { |
227 | // Cache the user account info | 227 | // Cache the user account info |
228 | m_accountCache.AddOrUpdate(data.PrincipalID, data, DateTime.Now + TimeSpan.FromSeconds(CACHE_EXPIRATION_SECONDS)); | 228 | m_accountCache.AddOrUpdate(data.PrincipalID, data, CACHE_EXPIRATION_SECONDS); |
229 | } | 229 | } |
230 | else | 230 | else |
231 | { | 231 | { |
@@ -290,7 +290,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
290 | GetFirstLastName(response["Name"].AsString(), out account.FirstName, out account.LastName); | 290 | GetFirstLastName(response["Name"].AsString(), out account.FirstName, out account.LastName); |
291 | 291 | ||
292 | // Cache the user account info | 292 | // Cache the user account info |
293 | m_accountCache.AddOrUpdate(account.PrincipalID, account, DateTime.Now + TimeSpan.FromSeconds(CACHE_EXPIRATION_SECONDS)); | 293 | m_accountCache.AddOrUpdate(account.PrincipalID, account, CACHE_EXPIRATION_SECONDS); |
294 | 294 | ||
295 | return account; | 295 | return account; |
296 | } | 296 | } |