ACME-275 : Fixed! Filtering on FB list works (tested with simulated data only so far)

2 files changed, 1 insertions, 20 deletions

diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp
index 679a76e26f..9cf822892e 100644
--- a/indra/llui/llfolderview.cpp
+++ b/indra/llui/llfolderview.cpp
@@ -1653,11 +1653,6 @@ void LLFolderView::update()
 
   BOOL is_visible = isInVisibleChain();
     
-    if (getName() == "Persons")
-    {
-        llinfos << "Merov : update Persons, is_visible = " << is_visible << llendl;
-    }
-
   // Puts folders/items in proper positions
   // arrange() takes the model filter flag into account and call sort() if necessary (CHUI-849)
   // It also handles the open/close folder animation
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index 88bc0ccfd4..0c0c54c38c 100755
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -953,12 +953,6 @@ static LLFastTimer::DeclareTimer FTM_ARRANGE("Arrange");
 // * Makes sure that this view and its children are the right size
 S32 LLFolderViewFolder::arrange( S32* width, S32* height )
 {
-    llinfos << "Merov : LLFolderViewFolder::arrange, folder = " << getName() << llendl;
-    if (getName() == "Facebook Friends Tab Two")
-    {
-        llinfos << "Merov : Arranging Facebook Friends Tab Two, needs arrange = " << needsArrange() << ", is open = " << isOpen() << llendl;
-    }
-    
 	// Sort before laying out contents
     // Note that we sort from the root (CHUI-849)
 	getRoot()->getFolderViewModel()->sort(this);
@@ -1115,11 +1109,7 @@ S32 LLFolderViewFolder::arrange( S32* width, S32* height )
 
 BOOL LLFolderViewFolder::needsArrange()
 {
-    if (getName() != "")
-    {
-        llinfos << "Merov : needsArrange for " << getName() << ", last = " << mLastArrangeGeneration << ", current = " << getRoot()->getArrangeGeneration() << ", need = " << (mLastArrangeGeneration < getRoot()->getArrangeGeneration() ? "true" : "false") << llendl;
-    }
-	return mLastArrangeGeneration != getRoot()->getArrangeGeneration();
+	return mLastArrangeGeneration < getRoot()->getArrangeGeneration();
 }
 
 // Passes selection information on to children and record selection
@@ -1641,10 +1631,6 @@ void LLFolderViewFolder::requestArrange()
 
 void LLFolderViewFolder::toggleOpen()
 {
-    if (getName() == "Facebook Friends Tab Two")
-    {
-        llinfos << "Merov : toggleOpen, currently open is = " << isOpen() << llendl;
-    }
 	setOpen(!isOpen());
 }