From 0eb2248f55c835e51705c4dc026e177f3930c5db Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Tue, 16 Apr 2013 22:36:32 -0700
Subject: made a separate button to add test users to the folder view list.
 Also when receiving facebook friends both the avatarlist and folderview will
 be populated.

---
 indra/newview/llpanelpeople.cpp                      | 13 +++++++++----
 indra/newview/skins/default/xui/en/menu_gear_fbc.xml |  9 ++++++++-
 2 files changed, 17 insertions(+), 5 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index 94b60ca2d6..34d565bbaa 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -567,7 +567,7 @@ LLPanelPeople::LLPanelPeople()
 	mCommitCallbackRegistrar.add("People.requestFBC", boost::bind(&LLPanelPeople::onFacebookAppRequestClicked, this));
 	mCommitCallbackRegistrar.add("People.sendFBC", boost::bind(&LLPanelPeople::onFacebookAppSendClicked, this));
 	mCommitCallbackRegistrar.add("People.testaddFBC", boost::bind(&LLPanelPeople::onFacebookTestAddClicked, this));
-
+	mCommitCallbackRegistrar.add("People.testaddFBCFolderView", boost::bind(&LLPanelPeople::addTestParticipant, this));
 
 	mCommitCallbackRegistrar.add("People.AddFriend", boost::bind(&LLPanelPeople::onAddFriendButtonClicked, this));
 	mCommitCallbackRegistrar.add("People.AddFriendWizard",	boost::bind(&LLPanelPeople::onAddFriendWizButtonClicked,	this));
@@ -1670,9 +1670,6 @@ bool LLPanelPeople::onConversationModelEvent(const LLSD& event)
 			LLConversationViewParticipant * participant_view = createConversationViewParticipant(participant_model);
 			participant_view->addToFolder(session_view);
 		}
-		
-
-		llinfos << "adding!!!!!!" << llendl;
 	}
 
 	return false;
@@ -1717,7 +1714,15 @@ void LLPanelPeople::showFacebookFriends(const LLSD& friends)
 		std::string name = i->second["name"].asString();
 		LLUUID agent_id = i->second.has("agent_id") ? i->second["agent_id"].asUUID() : LLUUID(NULL);
 		
+		//add to avatar list
 		mFacebookFriends->addNewItem(agent_id, name, false);
+
+		//Add to folder view
+		LLConversationItemSession * session_model = dynamic_cast<LLConversationItemSession *>(mConversationsItems[LLUUID(NULL)]);
+		if(session_model)
+		{
+			addParticipantToModel(session_model, agent_id, name);
+		}
 	}
 }
 
diff --git a/indra/newview/skins/default/xui/en/menu_gear_fbc.xml b/indra/newview/skins/default/xui/en/menu_gear_fbc.xml
index 4d8cbb432e..d73cee344b 100644
--- a/indra/newview/skins/default/xui/en/menu_gear_fbc.xml
+++ b/indra/newview/skins/default/xui/en/menu_gear_fbc.xml
@@ -28,10 +28,17 @@
      parameter="http://www.facebook.com/settings?tab=applications" />
   </menu_item_check>
   <menu_item_check
-   label="Facebook Add 300 test users"
+   label="Facebook Add 300 test users to AvatarList"
    layout="topleft"
    name="Facebook App Add">
     <menu_item_check.on_click
      function="People.testaddFBC"/>
   </menu_item_check>
+  <menu_item_check
+   label="Facebook Add 300 test users to FolderView"
+   layout="topleft"
+   name="Facebook App Add">
+    <menu_item_check.on_click
+     function="People.testaddFBCFolderView"/>
+  </menu_item_check>  
 </toggleable_menu>
\ No newline at end of file
-- 
cgit v1.2.3