diff options
| author | Melanie | 2010-10-21 07:33:01 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-21 07:33:01 +0100 |
| commit | fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e (patch) | |
| tree | ffe3d70e95b159dc4c7b3bf9613bca865d4067d3 /OpenSim/Region/CoreModules/ServiceConnectorsOut | |
| parent | COmmented the wrong line instead, now I commented them all to be on the safe ... (diff) | |
| parent | Skip empty strings in ParseString* functions (diff) | |
| download | opensim-SC-fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e.zip opensim-SC-fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e.tar.gz opensim-SC-fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e.tar.bz2 opensim-SC-fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs index 0da3f5f..155335b 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs | |||
| @@ -36,7 +36,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts | |||
| 36 | { | 36 | { |
| 37 | public class UserAccountCache | 37 | public class UserAccountCache |
| 38 | { | 38 | { |
| 39 | private const double CACHE_EXPIRATION_SECONDS = 120.0; | 39 | private const double CACHE_EXPIRATION_SECONDS = 120000.0; // 33 hours! |
| 40 | 40 | ||
| 41 | private static readonly ILog m_log = | 41 | private static readonly ILog m_log = |
| 42 | LogManager.GetLogger( | 42 | LogManager.GetLogger( |
| @@ -57,7 +57,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts | |||
| 57 | if (account != null) | 57 | if (account != null) |
| 58 | m_NameCache.AddOrUpdate(account.Name, account.PrincipalID, CACHE_EXPIRATION_SECONDS); | 58 | m_NameCache.AddOrUpdate(account.Name, account.PrincipalID, CACHE_EXPIRATION_SECONDS); |
| 59 | 59 | ||
| 60 | // m_log.DebugFormat("[USER CACHE]: cached user {0}", userID); | 60 | //m_log.DebugFormat("[USER CACHE]: cached user {0}", userID); |
| 61 | } | 61 | } |
| 62 | 62 | ||
| 63 | public UserAccount Get(UUID userID, out bool inCache) | 63 | public UserAccount Get(UUID userID, out bool inCache) |