diff options
| author | Melanie Thielker | 2010-08-14 14:00:12 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2010-08-14 14:00:12 +0200 |
| commit | f2d7f3e731659bbfcecf5a0846f711fcc38237f0 (patch) | |
| tree | 0959ceadcc72393da36d48fc29b785b84fc45917 /OpenSim/Region/CoreModules | |
| parent | Fix a possible nullref in BestAvatarResponsiveness policy (diff) | |
| parent | clearing some debugmessages (diff) | |
| download | opensim-SC-f2d7f3e731659bbfcecf5a0846f711fcc38237f0.zip opensim-SC-f2d7f3e731659bbfcecf5a0846f711fcc38237f0.tar.gz opensim-SC-f2d7f3e731659bbfcecf5a0846f711fcc38237f0.tar.bz2 opensim-SC-f2d7f3e731659bbfcecf5a0846f711fcc38237f0.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs index e1bc243..fb2edb9 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs | |||
| @@ -55,7 +55,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts | |||
| 55 | if (account != null) | 55 | if (account != null) |
| 56 | m_NameCache.AddOrUpdate(account.Name, account.PrincipalID, DateTime.Now + TimeSpan.FromMinutes(2.0d)); | 56 | m_NameCache.AddOrUpdate(account.Name, account.PrincipalID, DateTime.Now + TimeSpan.FromMinutes(2.0d)); |
| 57 | 57 | ||
| 58 | m_log.DebugFormat("[USER CACHE]: cached user {0}", userID); | 58 | // m_log.DebugFormat("[USER CACHE]: cached user {0}", userID); |
| 59 | } | 59 | } |
| 60 | 60 | ||
| 61 | public UserAccount Get(UUID userID, out bool inCache) | 61 | public UserAccount Get(UUID userID, out bool inCache) |