Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

author: Diva Canto 2011-01-17 17:41:06 -0800
committer: Diva Canto 2011-01-17 17:41:06 -0800
commit: a07375a7ae187b57371a508300ffcacbabf5a4df (patch)
tree: 3ee2ea5ff91a65c6b96d185c1352d37e9c3dffa9 /OpenSim/Services/HypergridService/UserAccountCache.cs
parent: Removed the call to sceneViewer.Reset upon MakeRoot and ChildAgentUpdate, bec... (diff)
parent: force objectId to UUID.Zero for non-overridden animations in AvatarAnimation ... (diff)
download: opensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.zip
opensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.tar.gz
opensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.tar.bz2
opensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.tar.xz
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
    {
        private const double CACHE_EXPIRATION_SECONDS = 120000.0; // 33 hours!
-        private static readonly ILog m_log =
+//        private static readonly ILog m_log =
-                LogManager.GetLogger(
+//                LogManager.GetLogger(
-                MethodBase.GetCurrentMethod().DeclaringType);
+//                MethodBase.GetCurrentMethod().DeclaringType);
+        
        private ExpiringCache<UUID, UserAccount> m_UUIDCache;
        private IUserAccountService m_UserAccountService;
author	Diva Canto	2011-01-17 17:41:06 -0800
committer	Diva Canto	2011-01-17 17:41:06 -0800
commit	a07375a7ae187b57371a508300ffcacbabf5a4df (patch)
tree	3ee2ea5ff91a65c6b96d185c1352d37e9c3dffa9 /OpenSim/Services/HypergridService/UserAccountCache.cs
parent	Removed the call to sceneViewer.Reset upon MakeRoot and ChildAgentUpdate, bec... (diff)
parent	force objectId to UUID.Zero for non-overridden animations in AvatarAnimation ... (diff)
download	opensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.zip opensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.tar.gz opensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.tar.bz2 opensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.tar.xz

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;