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/LLLoginService/LLLoginService.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-a07375a7ae187b57371a508300ffcacbabf5a4df.zip
opensim-SC-a07375a7ae187b57371a508300ffcacbabf5a4df.tar.gz
opensim-SC-a07375a7ae187b57371a508300ffcacbabf5a4df.tar.bz2
opensim-SC-a07375a7ae187b57371a508300ffcacbabf5a4df.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 281b6e3..7568870 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -282,7 +282,7 @@ namespace OpenSim.Services.LLLoginService
                // Get active gestures
                List<InventoryItemBase> gestures = m_InventoryService.GetActiveGestures(account.PrincipalID);
-                m_log.DebugFormat("[LLOGIN SERVICE]: {0} active gestures", gestures.Count);
+//                m_log.DebugFormat("[LLOGIN SERVICE]: {0} active gestures", gestures.Count);
                //
                // Login the presence
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/LLLoginService/LLLoginService.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-a07375a7ae187b57371a508300ffcacbabf5a4df.zip opensim-SC-a07375a7ae187b57371a508300ffcacbabf5a4df.tar.gz opensim-SC-a07375a7ae187b57371a508300ffcacbabf5a4df.tar.bz2 opensim-SC-a07375a7ae187b57371a508300ffcacbabf5a4df.tar.xz

diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 281b6e3..7568870 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -282,7 +282,7 @@ namespace OpenSim.Services.LLLoginService
282		282
283	// Get active gestures	283	// Get active gestures
284	List<InventoryItemBase> gestures = m_InventoryService.GetActiveGestures(account.PrincipalID);	284	List<InventoryItemBase> gestures = m_InventoryService.GetActiveGestures(account.PrincipalID);
285	m_log.DebugFormat("[LLOGIN SERVICE]: {0} active gestures", gestures.Count);	285	// m_log.DebugFormat("[LLOGIN SERVICE]: {0} active gestures", gestures.Count);
286		286
287	//	287	//
288	// Login the presence	288	// Login the presence