diff options
| author | Melanie | 2011-01-29 04:47:32 +0000 |
|---|---|---|
| committer | Melanie | 2011-01-29 04:47:32 +0000 |
| commit | 24a768a99b5de94042c7e170cc8aad83ec3a1ebc (patch) | |
| tree | 388c6fca95fda2e69550c7690659339915c590f9 /OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts | |
| parent | Significantly increase the total number of URL's available. In second life, ... (diff) | |
| parent | Flash out the prim count module (diff) | |
| download | opensim-SC-24a768a99b5de94042c7e170cc8aad83ec3a1ebc.zip opensim-SC-24a768a99b5de94042c7e170cc8aad83ec3a1ebc.tar.gz opensim-SC-24a768a99b5de94042c7e170cc8aad83ec3a1ebc.tar.bz2 opensim-SC-24a768a99b5de94042c7e170cc8aad83ec3a1ebc.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs index 05042f4..cbe2eaa 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs | |||
| @@ -38,9 +38,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts | |||
| 38 | { | 38 | { |
| 39 | private const double CACHE_EXPIRATION_SECONDS = 120000.0; // 33 hours! | 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( |
| 43 | MethodBase.GetCurrentMethod().DeclaringType); | 43 | // MethodBase.GetCurrentMethod().DeclaringType); |
| 44 | |||
| 44 | private ExpiringCache<UUID, UserAccount> m_UUIDCache; | 45 | private ExpiringCache<UUID, UserAccount> m_UUIDCache; |
| 45 | private ExpiringCache<string, UUID> m_NameCache; | 46 | private ExpiringCache<string, UUID> m_NameCache; |
| 46 | 47 | ||