merge

6 files changed, 46 insertions, 3 deletions

diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index 7e281bd99b..af8c7e9dc4 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -342,8 +342,11 @@ void LLFloaterIMContainer::onStubCollapseButtonClicked()
 
 void LLFloaterIMContainer::onSpeakButtonClicked()
 {
-	LLAgent::toggleMicrophone("speak");
-	updateSpeakBtnState();
+	//LLAgent::toggleMicrophone("speak");
+	//updateSpeakBtnState();
+
+	LLParticipantList* session_model = dynamic_cast<LLParticipantList*>(mConversationsItems[LLUUID(NULL)]);
+	session_model->addTestAvatarAgents();
 }
 void LLFloaterIMContainer::onExpandCollapseButtonClicked()
 {
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index cabc2cf4fe..2e97e8bab9 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -49,6 +49,7 @@
 #include "llavatarlist.h"
 #include "llavatarlistitem.h"
 #include "llcallingcard.h"			// for LLAvatarTracker
+#include "llerror.h"
 #include "llfloateravatarpicker.h"
 //#include "llfloaterminiinspector.h"
 #include "llfriendcard.h"
@@ -557,6 +558,7 @@ LLPanelPeople::LLPanelPeople()
 	mCommitCallbackRegistrar.add("People.loginFBC", boost::bind(&LLPanelPeople::onLoginFbcButtonClicked, this));
 	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.AddFriend", boost::bind(&LLPanelPeople::onAddFriendButtonClicked, this));
@@ -1789,4 +1791,19 @@ void LLPanelPeople::onFacebookAppSendClicked()
 	p.url("https://www.facebook.com/dialog/send?app_id=565771023434202&name=Join Second Life!&link=https://join.secondlife.com&redirect_uri=" + FBC_SERVICES_URL);
 	openFacebookWeb(p);
 }
+
+void LLPanelPeople::onFacebookTestAddClicked()
+{
+	mFacebookFriends->clear();
+
+	LL_INFOS("LLPanelPeople") << "start adding 300 users" << LL_ENDL;
+
+	for(int i = 0; i < 300; ++i)
+	{
+		mFacebookFriends->addNewItem(LLUUID(), "Test", false);
+	}
+
+	LL_INFOS("LLPanelPeople") << "finished adding 300 users" << LL_ENDL;
+}
+
 // EOF
diff --git a/indra/newview/llpanelpeople.h b/indra/newview/llpanelpeople.h
index ffb3f74192..76207108cd 100644
--- a/indra/newview/llpanelpeople.h
+++ b/indra/newview/llpanelpeople.h
@@ -124,6 +124,7 @@ private:
 	void					onLoginFbcButtonClicked();
 	void					onFacebookAppRequestClicked();
 	void					onFacebookAppSendClicked();
+	void					onFacebookTestAddClicked();
 
 	bool					onFriendsViewSortMenuItemCheck(const LLSD& userdata);
 	bool					onRecentViewSortMenuItemCheck(const LLSD& userdata);
diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp
index c53760bca1..e05b27e539 100644
--- a/indra/newview/llparticipantlist.cpp
+++ b/indra/newview/llparticipantlist.cpp
@@ -27,6 +27,7 @@
 #include "llviewerprecompiledheaders.h"
 
 #include "llavatarnamecache.h"
+#include "llerror.h"
 #include "llimview.h"
 #include "llfloaterimcontainer.h"
 #include "llparticipantlist.h"
@@ -401,6 +402,19 @@ void LLParticipantList::addAvatarIDExceptAgent(const LLUUID& avatar_id)
 	adjustParticipant(avatar_id);
 }
 
+
+void LLParticipantList::addTestAvatarAgents()
+{
+	LL_INFOS("LLParticipantList") << "start adding 300 users" << LL_ENDL;
+
+	for(int i = 0; i < 300; ++i)
+	{
+		addAvatarIDExceptAgent(LLUUID().generateNewID());
+	}
+
+	LL_INFOS("LLParticipantList") << "finished adding 300 users" << LL_ENDL;
+}
+
 void LLParticipantList::adjustParticipant(const LLUUID& speaker_id)
 {
 	LLPointer<LLSpeaker> speakerp = mSpeakerMgr->findSpeaker(speaker_id);
diff --git a/indra/newview/llparticipantlist.h b/indra/newview/llparticipantlist.h
index 3a3ae76604..936e289c08 100644
--- a/indra/newview/llparticipantlist.h
+++ b/indra/newview/llparticipantlist.h
@@ -50,6 +50,7 @@ public:
 	 * @param[in] avatar_id - Avatar UUID to be added into the list
 	 */
 	void addAvatarIDExceptAgent(const LLUUID& avatar_id);
+	void addTestAvatarAgents();
 
 	/**
 	 * Refreshes the participant list.
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 b05ba46107..4d8cbb432e 100644
--- a/indra/newview/skins/default/xui/en/menu_gear_fbc.xml
+++ b/indra/newview/skins/default/xui/en/menu_gear_fbc.xml
@@ -26,5 +26,12 @@
     <menu_item_check.on_click
      function="People.sendFBC"
      parameter="http://www.facebook.com/settings?tab=applications" />
-  </menu_item_check>  
+  </menu_item_check>
+  <menu_item_check
+   label="Facebook Add 300 test users"
+   layout="topleft"
+   name="Facebook App Add">
+    <menu_item_check.on_click
+     function="People.testaddFBC"/>
+  </menu_item_check>
 </toggleable_menu>
\ No newline at end of file