aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/HypergridService/UserAccountCache.cs
diff options
context:
space:
mode:
authorMelanie2011-01-18 01:27:11 +0000
committerMelanie2011-01-18 01:27:11 +0000
commitac16a49ca04d1aec808ed655bdee4897cf805639 (patch)
tree827ff0c4d77d63d348b38015fb1678608c33d35f /OpenSim/Services/HypergridService/UserAccountCache.cs
parentPrevent activation and deactivation of gestures from clobbering the slam (diff)
parentPut the 'new' back to avoid a warning. Yes, we want to hide it. (diff)
downloadopensim-SC_OLD-ac16a49ca04d1aec808ed655bdee4897cf805639.zip
opensim-SC_OLD-ac16a49ca04d1aec808ed655bdee4897cf805639.tar.gz
opensim-SC_OLD-ac16a49ca04d1aec808ed655bdee4897cf805639.tar.bz2
opensim-SC_OLD-ac16a49ca04d1aec808ed655bdee4897cf805639.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Services/HypergridService/UserAccountCache.cs')
-rw-r--r--OpenSim/Services/HypergridService/UserAccountCache.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Services/HypergridService/UserAccountCache.cs b/OpenSim/Services/HypergridService/UserAccountCache.cs
index 3e9aea1..65f9dd5 100644
--- a/OpenSim/Services/HypergridService/UserAccountCache.cs
+++ b/OpenSim/Services/HypergridService/UserAccountCache.cs
@@ -13,9 +13,10 @@ namespace OpenSim.Services.HypergridService
13 { 13 {
14 private const double CACHE_EXPIRATION_SECONDS = 120000.0; // 33 hours! 14 private const double CACHE_EXPIRATION_SECONDS = 120000.0; // 33 hours!
15 15
16 private static readonly ILog m_log = 16// private static readonly ILog m_log =
17 LogManager.GetLogger( 17// LogManager.GetLogger(
18 MethodBase.GetCurrentMethod().DeclaringType); 18// MethodBase.GetCurrentMethod().DeclaringType);
19
19 private ExpiringCache<UUID, UserAccount> m_UUIDCache; 20 private ExpiringCache<UUID, UserAccount> m_UUIDCache;
20 21
21 private IUserAccountService m_UserAccountService; 22 private IUserAccountService m_UserAccountService;