diff options
author | Melanie | 2011-01-18 01:28:50 +0000 |
---|---|---|
committer | Melanie | 2011-01-18 01:28:50 +0000 |
commit | 6306578fcf812bfdb27cb00b6c3fc2886e247b87 (patch) | |
tree | 19f379c3507a1714af5d7bb223dda1f6b0a8dddb /OpenSim/Services/LLLoginService | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC_OLD-6306578fcf812bfdb27cb00b6c3fc2886e247b87.zip opensim-SC_OLD-6306578fcf812bfdb27cb00b6c3fc2886e247b87.tar.gz opensim-SC_OLD-6306578fcf812bfdb27cb00b6c3fc2886e247b87.tar.bz2 opensim-SC_OLD-6306578fcf812bfdb27cb00b6c3fc2886e247b87.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/LLLoginService')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginResponse.cs | 2 | ||||
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs index e98cc22..2ffcaf7 100644 --- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs +++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs | |||
@@ -667,7 +667,7 @@ namespace OpenSim.Services.LLLoginService | |||
667 | protected virtual ArrayList GetInventoryLibrary(ILibraryService library) | 667 | protected virtual ArrayList GetInventoryLibrary(ILibraryService library) |
668 | { | 668 | { |
669 | Dictionary<UUID, InventoryFolderImpl> rootFolders = library.GetAllFolders(); | 669 | Dictionary<UUID, InventoryFolderImpl> rootFolders = library.GetAllFolders(); |
670 | m_log.DebugFormat("[LLOGIN]: Library has {0} folders", rootFolders.Count); | 670 | // m_log.DebugFormat("[LLOGIN]: Library has {0} folders", rootFolders.Count); |
671 | //Dictionary<UUID, InventoryFolderImpl> rootFolders = new Dictionary<UUID,InventoryFolderImpl>(); | 671 | //Dictionary<UUID, InventoryFolderImpl> rootFolders = new Dictionary<UUID,InventoryFolderImpl>(); |
672 | ArrayList folderHashes = new ArrayList(); | 672 | ArrayList folderHashes = new ArrayList(); |
673 | 673 | ||
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 93e4a8f..6c4dc4d 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -289,7 +289,7 @@ namespace OpenSim.Services.LLLoginService | |||
289 | 289 | ||
290 | // Get active gestures | 290 | // Get active gestures |
291 | List<InventoryItemBase> gestures = m_InventoryService.GetActiveGestures(account.PrincipalID); | 291 | List<InventoryItemBase> gestures = m_InventoryService.GetActiveGestures(account.PrincipalID); |
292 | m_log.DebugFormat("[LLOGIN SERVICE]: {0} active gestures", gestures.Count); | 292 | // m_log.DebugFormat("[LLOGIN SERVICE]: {0} active gestures", gestures.Count); |
293 | 293 | ||
294 | // | 294 | // |
295 | // Login the presence | 295 | // Login the presence |