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/LLLoginResponse.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, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index f985ab2..ebd6f7c 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -661,7 +661,7 @@ namespace OpenSim.Services.LLLoginService
        protected virtual ArrayList GetInventoryLibrary(ILibraryService library)
        {
            Dictionary<UUID, InventoryFolderImpl> rootFolders = library.GetAllFolders();
-            m_log.DebugFormat("[LLOGIN]: Library has {0} folders", rootFolders.Count);
+//            m_log.DebugFormat("[LLOGIN]: Library has {0} folders", rootFolders.Count);
            //Dictionary<UUID, InventoryFolderImpl> rootFolders = new Dictionary<UUID,InventoryFolderImpl>();
            ArrayList folderHashes = new ArrayList();
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/LLLoginResponse.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/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs index f985ab2..ebd6f7c 100644 --- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs +++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -661,7 +661,7 @@ namespace OpenSim.Services.LLLoginService
661	protected virtual ArrayList GetInventoryLibrary(ILibraryService library)	661	protected virtual ArrayList GetInventoryLibrary(ILibraryService library)
662	{	662	{
663	Dictionary<UUID, InventoryFolderImpl> rootFolders = library.GetAllFolders();	663	Dictionary<UUID, InventoryFolderImpl> rootFolders = library.GetAllFolders();
664	m_log.DebugFormat("[LLOGIN]: Library has {0} folders", rootFolders.Count);	664	// m_log.DebugFormat("[LLOGIN]: Library has {0} folders", rootFolders.Count);
665	//Dictionary<UUID, InventoryFolderImpl> rootFolders = new Dictionary<UUID,InventoryFolderImpl>();	665	//Dictionary<UUID, InventoryFolderImpl> rootFolders = new Dictionary<UUID,InventoryFolderImpl>();
666	ArrayList folderHashes = new ArrayList();	666	ArrayList folderHashes = new ArrayList();
667		667