8 files changed, 751 insertions, 2 deletions

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index bd0169fb2f..02ab1c9ff1 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -495,6 +495,7 @@ set(viewer_SOURCE_FILES
     llsidetraypanelcontainer.cpp
     llsky.cpp
     llslurl.cpp
+    llsociallist.cpp
     llspatialpartition.cpp
     llspeakers.cpp
     llspeakingindicatormanager.cpp
@@ -1072,6 +1073,7 @@ set(viewer_HEADER_FILES
     llsidetraypanelcontainer.h
     llsky.h
     llslurl.h
+    llsociallist.h
     llspatialpartition.h
     llspeakers.h
     llspeakingindicatormanager.h
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index 4138558bad..2ca22a1382 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -63,19 +63,25 @@
 #include "llviewermenu.h"			// for gMenuHolder
 #include "llvoiceclient.h"
 #include "llworld.h"
+#include "llsociallist.h"
 #include "llspeakers.h"
+#include "llfloaterwebcontent.h"
 
 #define FRIEND_LIST_UPDATE_TIMEOUT	0.5
 #define NEARBY_LIST_UPDATE_INTERVAL 1
+#define FBCTEST_LIST_UPDATE_INTERVAL 0.25
 
 static const std::string NEARBY_TAB_NAME	= "nearby_panel";
 static const std::string FRIENDS_TAB_NAME	= "friends_panel";
 static const std::string GROUP_TAB_NAME		= "groups_panel";
 static const std::string RECENT_TAB_NAME	= "recent_panel";
 static const std::string BLOCKED_TAB_NAME	= "blocked_panel"; // blocked avatars
-
+static const std::string FBCTEST_TAB_NAME	= "fbctest_panel";
 static const std::string COLLAPSED_BY_USER  = "collapsed_by_user";
 
+static const std::string FBC_SERVICES_URL = "https://pdp15.lindenlab.com";
+static const std::string FBC_SERVICES_REDIRECT_URI = "http://axcho.com/secondlife/";
+
 /** Comparator for comparing avatar items by last interaction date */
 class LLAvatarItemRecentComparator : public LLAvatarItemComparator
 {
@@ -489,10 +495,51 @@ public:
 	}
 };
 
+/**
+ * Periodically updates the FBC test list after a login is initiated.
+ * 
+ * The period is defined by FBCTEST_LIST_UPDATE_INTERVAL constant.
+ */
+class LLFbcTestListUpdater : public LLAvatarListUpdater
+{
+	LOG_CLASS(LLFbcTestListUpdater);
+
+public:
+	LLFbcTestListUpdater(callback_t cb)
+	:	LLAvatarListUpdater(cb, FBCTEST_LIST_UPDATE_INTERVAL)
+	{
+		setActive(false);
+	}
+
+	/*virtual*/ void setActive(bool val)
+	{
+		if (val)
+		{
+			// update immediately and start regular updates
+			update();
+			mEventTimer.start(); 
+		}
+		else
+		{
+			// stop regular updates
+			mEventTimer.stop();
+		}
+	}
+
+	/*virtual*/ BOOL tick()
+	{
+		update();
+		return FALSE;
+	}
+private:
+};
+
 //=============================================================================
 
 LLPanelPeople::LLPanelPeople()
 	:	LLPanel(),
+		mConnectedToFbc(false),
+		mTryToConnectToFbc(true),
 		mTabContainer(NULL),
 		mOnlineFriendList(NULL),
 		mAllFriendList(NULL),
@@ -504,8 +551,14 @@ LLPanelPeople::LLPanelPeople()
 	mFriendListUpdater = new LLFriendListUpdater(boost::bind(&LLPanelPeople::updateFriendList,	this));
 	mNearbyListUpdater = new LLNearbyListUpdater(boost::bind(&LLPanelPeople::updateNearbyList,	this));
 	mRecentListUpdater = new LLRecentListUpdater(boost::bind(&LLPanelPeople::updateRecentList,	this));
+	mFbcTestListUpdater = new LLFbcTestListUpdater(boost::bind(&LLPanelPeople::updateFbcTestList,	this));
 	mButtonsUpdater = new LLButtonsUpdater(boost::bind(&LLPanelPeople::updateButtons, this));
 
+	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.AddFriend", boost::bind(&LLPanelPeople::onAddFriendButtonClicked, this));
 	mCommitCallbackRegistrar.add("People.AddFriendWizard",	boost::bind(&LLPanelPeople::onAddFriendWizButtonClicked,	this));
 	mCommitCallbackRegistrar.add("People.DelFriend",		boost::bind(&LLPanelPeople::onDeleteFriendButtonClicked,	this));
@@ -532,11 +585,14 @@ LLPanelPeople::~LLPanelPeople()
 	delete mNearbyListUpdater;
 	delete mFriendListUpdater;
 	delete mRecentListUpdater;
+	delete mFbcTestListUpdater;
 
 	if(LLVoiceClient::instanceExists())
 	{
 		LLVoiceClient::getInstance()->removeObserver(this);
 	}
+
+	if (mFbcTestBrowserHandle.get()) mFbcTestBrowserHandle.get()->die();
 }
 
 void LLPanelPeople::onFriendsAccordionExpandedCollapsed(LLUICtrl* ctrl, const LLSD& param, LLAvatarList* avatar_list)
@@ -616,6 +672,10 @@ BOOL LLPanelPeople::postBuild()
 	mAllFriendList->setContextMenu(&LLPanelPeopleMenus::gPeopleContextMenu);
 	mOnlineFriendList->setContextMenu(&LLPanelPeopleMenus::gPeopleContextMenu);
 
+	LLPanel * social_tab = getChild<LLPanel>(FBCTEST_TAB_NAME);
+	mFacebookFriends = social_tab->getChild<LLSocialList>("facebook_friends");
+	social_tab->setVisibleCallback(boost::bind(&Updater::setActive, mFbcTestListUpdater, _2));
+
 	setSortOrder(mRecentList,		(ESortOrder)gSavedSettings.getU32("RecentPeopleSortOrder"),	false);
 	setSortOrder(mAllFriendList,	(ESortOrder)gSavedSettings.getU32("FriendsSortOrder"),		false);
 	setSortOrder(mNearbyList,		(ESortOrder)gSavedSettings.getU32("NearbyPeopleSortOrder"),	false);
@@ -664,6 +724,15 @@ BOOL LLPanelPeople::postBuild()
 	// Must go after setting commit callback and initializing all pointers to children.
 	mTabContainer->selectTabByName(NEARBY_TAB_NAME);
 
+	mFBCGearButton = getChild<LLMenuButton>("fbc_options_btn");
+
+	LLToggleableMenu* fbc_menu  = LLUICtrlFactory::getInstance()->createFromFile<LLToggleableMenu>("menu_gear_fbc.xml",  gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
+	if(fbc_menu)
+	{
+		mFBCMenuHandle = fbc_menu->getHandle();
+		mFBCGearButton->setMenu(fbc_menu);
+	}
+
 	LLVoiceClient::getInstance()->addObserver(this);
 
 	// call this method in case some list is empty and buttons can be in inconsistent state
@@ -786,6 +855,57 @@ void LLPanelPeople::updateRecentList()
 	mRecentList->setDirty();
 }
 
+void LLPanelPeople::updateFbcTestList()
+{
+	if (mFbcTestBrowserHandle.get())
+	{
+		// get the current browser url (from the title bar, of course!)
+		std::string url = mFbcTestBrowserHandle.get()->getTitle();
+
+		// if the browser has redirected from facebook
+		if (url.find(FBC_SERVICES_REDIRECT_URI) == 0)
+		{
+			// find the auth code in the url
+			std::string begin_string = "code=";
+			std::string end_string = "#";
+			size_t begin_index = begin_string.length() + url.find(begin_string, FBC_SERVICES_REDIRECT_URI.length());
+			size_t end_index = url.find(end_string, begin_index);
+
+			// extract the auth code from the url
+			std::string auth_code;
+			if (end_index != std::string::npos)
+			{
+				auth_code = url.substr(begin_index, end_index - begin_index);
+			}
+			else
+			{
+				auth_code = url.substr(begin_index);
+			}
+			llinfos << "extracted code " << auth_code << " from url " << url << llendl;
+			
+			// finish authenticating on the server
+			connectToFacebook(auth_code);
+
+			// close the browser window
+			mFbcTestBrowserHandle.get()->die();
+			
+			// stop updating
+			mFbcTestListUpdater->setActive(false);
+		}
+	}
+	else if (mTryToConnectToFbc)
+	{	
+		// try to reconnect to facebook!
+		tryToReconnectToFacebook();
+
+		// don't try again
+		mTryToConnectToFbc = false;
+		
+		// stop updating
+		mFbcTestListUpdater->setActive(false);
+	}
+}
+
 void LLPanelPeople::updateButtons()
 {
 	std::string cur_tab		= getActiveTabName();
@@ -870,6 +990,9 @@ LLUUID LLPanelPeople::getCurrentItemID() const
 
 	if (cur_tab == BLOCKED_TAB_NAME)
 		return LLUUID::null; // FIXME?
+	
+	if (cur_tab == FBCTEST_TAB_NAME)
+		return LLUUID::null;
 
 	llassert(0 && "unknown tab selected");
 	return LLUUID::null;
@@ -893,6 +1016,8 @@ void LLPanelPeople::getCurrentItemIDs(uuid_vec_t& selected_uuids) const
 		mGroupList->getSelectedUUIDs(selected_uuids);
 	else if (cur_tab == BLOCKED_TAB_NAME)
 		selected_uuids.clear(); // FIXME?
+	else if (cur_tab == FBCTEST_TAB_NAME)
+		return;
 	else
 		llassert(0 && "unknown tab selected");
 
@@ -1225,7 +1350,7 @@ void LLPanelPeople::onFriendsViewSortMenuItemClicked(const LLSD& userdata)
 		mAllFriendList->showPermissions(show_permissions);
 		mOnlineFriendList->showPermissions(show_permissions);
 	}
-}
+	}
 
 void LLPanelPeople::onGroupsViewSortMenuItemClicked(const LLSD& userdata)
 {
@@ -1446,4 +1571,216 @@ bool LLPanelPeople::isAccordionCollapsedByUser(const std::string& name)
 	return isAccordionCollapsedByUser(getChild<LLUICtrl>(name));
 }
 
+void LLPanelPeople::openFacebookWeb(LLFloaterWebContent::Params& p)
+{
+	LLFloater* browser = LLFloaterReg::showInstance("web_content", p);
+
+	if (browser)
+	{
+		// start checking the browser to see if the data is available yet
+		mFbcTestBrowserHandle = browser->getHandle();
+		mFbcTestListUpdater->setActive(true);
+	}
+}
+
+void LLPanelPeople::showFacebookFriends(const LLSD& friends)
+{
+	mFacebookFriends->clear();
+
+	for (LLSD::array_const_iterator i = friends.beginArray(); i != friends.endArray(); ++i)
+	{
+		std::string name = (*i)["name"].asString();
+		LLUUID agent_id = (*i).has("agent_id") ? (*i)["agent_id"].asUUID() : LLUUID(NULL);
+		
+		mFacebookFriends->addNewItem(agent_id, name, false);
+	}
+}
+
+void LLPanelPeople::hideFacebookFriends()
+{
+	mFacebookFriends->clear();
+}
+
+class FacebookConnectResponder : public LLHTTPClient::Responder
+{
+public:
+
+	LLPanelPeople * mPanelPeople;
+
+	FacebookConnectResponder(LLPanelPeople * panel_people) : mPanelPeople(panel_people) {}
+
+	/*virtual*/ void completed(U32 status, const std::string& reason, const LLSD& content)
+	{
+		if (isGoodStatus(status))
+		{
+			llinfos << content << llendl;
+			
+			// grab some graph data now that we are connected
+			if (content["success"])
+			{
+				mPanelPeople->mConnectedToFbc = true;
+				mPanelPeople->loadFacebookFriends();
+			}
+			else if (content.has("error"))
+			{
+				llinfos << "failed to connect. reason: " << content["error"]["message"] << llendl;
+			}
+		}
+		else
+		{
+			llinfos << "failed to get response. reason: " << reason << " status: " << status << llendl;
+		}
+	}
+};
+
+class FacebookDisconnectResponder : public LLHTTPClient::Responder
+{
+public:
+
+	LLPanelPeople * mPanelPeople;
+
+	FacebookDisconnectResponder(LLPanelPeople * panel_people) : mPanelPeople(panel_people) {}
+
+	/*virtual*/ void completed(U32 status, const std::string& reason, const LLSD& content)
+	{
+		if (isGoodStatus(status))
+		{
+			llinfos << content << llendl;
+			
+			// hide all the facebook stuff
+			if (content["success"])
+			{
+				mPanelPeople->mConnectedToFbc = false;
+				mPanelPeople->hideFacebookFriends();
+			}
+			else if (content.has("error"))
+			{
+				llinfos << "failed to disconnect. reason: " << content["error"]["message"] << llendl;
+			}
+		}
+		else
+		{
+			llinfos << "failed to get response. reason: " << reason << " status: " << status << llendl;
+		}
+	}
+};
+
+class FacebookConnectedResponder : public LLHTTPClient::Responder
+{
+public:
+
+	LLPanelPeople * mPanelPeople;
+	bool mShowLoginIfNotConnected;
+
+	FacebookConnectedResponder(LLPanelPeople * panel_people, bool show_login_if_not_connected) : mPanelPeople(panel_people), mShowLoginIfNotConnected(show_login_if_not_connected) {}
+
+	/*virtual*/ void completed(U32 status, const std::string& reason, const LLSD& content)
+	{
+		if (isGoodStatus(status))
+		{
+			llinfos << content << llendl;
+
+			// grab some graph data if already connected
+			if (content["connected"])
+			{
+				mPanelPeople->mConnectedToFbc = true;
+				mPanelPeople->loadFacebookFriends();
+			}
+			// show the facebook login page if not connected yet
+			else if (mShowLoginIfNotConnected)
+			{
+				LLFloaterWebContent::Params p;
+				p.url("https://www.facebook.com/dialog/oauth?client_id=565771023434202&redirect_uri=" + FBC_SERVICES_REDIRECT_URI);
+				mPanelPeople->openFacebookWeb(p);
+			}
+		}
+		else
+		{
+			llinfos << "failed to get response. reason: " << reason << " status: " << status << llendl;
+		}
+	}
+};
+
+class FacebookFriendsResponder : public LLHTTPClient::Responder
+{
+public:
+
+	LLPanelPeople * mPanelPeople;
+
+	FacebookFriendsResponder(LLPanelPeople * panel_people) : mPanelPeople(panel_people) {}
+
+	/*virtual*/ void completed(U32 status, const std::string& reason, const LLSD& content)
+	{
+		if (isGoodStatus(status))
+		{
+			llinfos << content << llendl;
+
+			// display the list of friends
+			if (content.has("friends"))
+			{
+				mPanelPeople->showFacebookFriends(content["friends"]);
+			}
+			else if (content.has("error"))
+			{
+				llinfos << "failed to get facebook friends. reason: " << content["error"]["message"] << llendl;
+			}
+		}
+		else
+		{
+			llinfos << "failed to get response. reason: " << reason << " status: " << status << llendl;
+		}
+	}
+};
+
+void LLPanelPeople::loadFacebookFriends()
+{
+	LLHTTPClient::get(FBC_SERVICES_URL + "/agent/" + gAgentID.asString() + "/fbc/friends", new FacebookFriendsResponder(this));
+}
+
+void LLPanelPeople::tryToReconnectToFacebook()
+{
+	if (!mConnectedToFbc)
+	{
+		LLHTTPClient::get(FBC_SERVICES_URL + "/agent/" + gAgentID.asString() + "/fbc/connected", new FacebookConnectedResponder(this, false));
+	}
+}
+
+void LLPanelPeople::connectToFacebook(const std::string& auth_code)
+{
+	LLSD body;
+	body["code"] = auth_code;
+	body["redirect_uri"] = FBC_SERVICES_REDIRECT_URI;
+	LLHTTPClient::post(FBC_SERVICES_URL + "/agent/" + gAgentID.asString() + "/fbc/connect", body, new FacebookConnectResponder(this));
+}
+
+void LLPanelPeople::disconnectFromFacebook()
+{
+	LLHTTPClient::post(FBC_SERVICES_URL + "/agent/" + gAgentID.asString() + "/fbc/disconnect", LLSD(), new FacebookDisconnectResponder(this));
+}
+
+void LLPanelPeople::onLoginFbcButtonClicked()
+{
+	if (mConnectedToFbc)
+	{
+		disconnectFromFacebook();
+	}
+	else
+	{
+		LLHTTPClient::get(FBC_SERVICES_URL + "/agent/" + gAgentID.asString() + "/fbc/connected", new FacebookConnectedResponder(this, true));
+	}
+}
+
+void LLPanelPeople::onFacebookAppRequestClicked()
+{
+	LLFloaterWebContent::Params p;
+	p.url("http://www.facebook.com/dialog/apprequests?app_id=565771023434202&message=Test&redirect_uri=" + FBC_SERVICES_URL);
+	openFacebookWeb(p);
+}
+
+void LLPanelPeople::onFacebookAppSendClicked()
+{
+	LLFloaterWebContent::Params p;
+	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);
+}
 // EOF
diff --git a/indra/newview/llpanelpeople.h b/indra/newview/llpanelpeople.h
index 4740964dee..ffb3f74192 100644
--- a/indra/newview/llpanelpeople.h
+++ b/indra/newview/llpanelpeople.h
@@ -30,12 +30,15 @@
 #include <llpanel.h>
 
 #include "llcallingcard.h" // for avatar tracker
+#include "llfloaterwebcontent.h"
 #include "llvoiceclient.h"
 
 class LLAvatarList;
+class LLAvatarListSocial;
 class LLAvatarName;
 class LLFilterEditor;
 class LLGroupList;
+class LLSocialList;
 class LLMenuButton;
 class LLTabContainer;
 
@@ -55,6 +58,17 @@ public:
 	// when voice is available
 	/*virtual*/ void onChange(EStatusType status, const std::string &channelURI, bool proximal);
 
+	void openFacebookWeb(LLFloaterWebContent::Params& p);
+	void showFacebookFriends(const LLSD& friends);
+	void hideFacebookFriends();
+	void loadFacebookFriends();
+	void tryToReconnectToFacebook();
+	void connectToFacebook(const std::string& auth_code);
+	void disconnectFromFacebook();
+	
+	bool mConnectedToFbc;
+	bool mTryToConnectToFbc;
+
 	// internals
 	class Updater;
 
@@ -75,6 +89,7 @@ private:
 	void					updateFriendList();
 	void					updateNearbyList();
 	void					updateRecentList();
+	void					updateFbcTestList();
 
 	bool					isItemsFreeOfFriends(const uuid_vec_t& uuids);
 
@@ -106,6 +121,10 @@ private:
 	void					onGroupsViewSortMenuItemClicked(const LLSD& userdata);
 	void					onRecentViewSortMenuItemClicked(const LLSD& userdata);
 
+	void					onLoginFbcButtonClicked();
+	void					onFacebookAppRequestClicked();
+	void					onFacebookAppSendClicked();
+
 	bool					onFriendsViewSortMenuItemCheck(const LLSD& userdata);
 	bool					onRecentViewSortMenuItemCheck(const LLSD& userdata);
 	bool					onNearbyViewSortMenuItemCheck(const LLSD& userdata);
@@ -132,15 +151,20 @@ private:
 	LLAvatarList*			mNearbyList;
 	LLAvatarList*			mRecentList;
 	LLGroupList*			mGroupList;
+	LLSocialList*			mFacebookFriends;
 	LLNetMap*				mMiniMap;
 
 	std::vector<std::string> mSavedOriginalFilters;
 	std::vector<std::string> mSavedFilters;
+	LLHandle<LLView>		mFBCMenuHandle;
+	LLHandle<LLFloater>		mFbcTestBrowserHandle;
 
 	Updater*				mFriendListUpdater;
 	Updater*				mNearbyListUpdater;
 	Updater*				mRecentListUpdater;
+	Updater*				mFbcTestListUpdater;
 	Updater*				mButtonsUpdater;
+	LLMenuButton*			mFBCGearButton;
     LLHandle< LLFloater >	mPicker;
 };
 
diff --git a/indra/newview/llsociallist.cpp b/indra/newview/llsociallist.cpp
new file mode 100644
index 0000000000..bcf6d5a63c
--- /dev/null
+++ b/indra/newview/llsociallist.cpp
@@ -0,0 +1,155 @@
+sDestroyImmediate
+/** 
+* @file llsociallist.cpp
+* @brief Implementation of llsociallist
+* @author Gilbert@lindenlab.com
+*
+* $LicenseInfo:firstyear=2013&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2013, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llsociallist.h"
+
+#include "llavataractions.h"
+#include "llfloaterreg.h"
+#include "llavatariconctrl.h"
+#include "llavatarnamecache.h"
+#include "lloutputmonitorctrl.h"
+#include "lltextutil.h"
+    
+static LLDefaultChildRegistry::Register<LLSocialList> r("social_list");
+
+LLSocialList::LLSocialList(const Params&p) : LLFlatListViewEx(p)
+{
+
+}
+
+LLSocialList::~LLSocialList()
+{
+
+}
+
+void LLSocialList::draw()
+{
+	LLFlatListView::draw();
+}
+
+void LLSocialList::refresh()
+{
+
+}
+
+void LLSocialList::addNewItem(const LLUUID& id, const std::string& name, BOOL is_online, EAddPosition pos)
+{
+	LLSocialListItem * item = new LLSocialListItem();
+	LLAvatarName avatar_name;
+	bool has_avatar_name = id.notNull() && LLAvatarNameCache::get(id, &avatar_name);
+
+	item->mAvatarId = id;
+	if(id.notNull())
+	{
+		item->mIcon->setValue(id);
+	}
+
+	item->setName(has_avatar_name ? name + " (" + avatar_name.getDisplayName() + ")" : name, mNameFilter);
+	addItem(item, id, pos);
+}
+
+LLSocialListItem::LLSocialListItem()
+{
+	buildFromFile("panel_avatar_list_item.xml");
+}
+
+LLSocialListItem::~LLSocialListItem()
+{
+
+}
+
+BOOL LLSocialListItem::postBuild()
+{
+	mIcon = getChild<LLAvatarIconCtrl>("avatar_icon");
+	mLabelTextBox = getChild<LLTextBox>("avatar_name");
+
+	mLastInteractionTime = getChild<LLTextBox>("last_interaction");
+	mIconPermissionOnline = getChild<LLIconCtrl>("permission_online_icon");
+	mIconPermissionMap = getChild<LLIconCtrl>("permission_map_icon");
+	mIconPermissionEditMine = getChild<LLIconCtrl>("permission_edit_mine_icon");
+	mIconPermissionEditTheirs = getChild<LLIconCtrl>("permission_edit_theirs_icon");
+	mSpeakingIndicator = getChild<LLOutputMonitorCtrl>("speaking_indicator");
+	mInfoBtn = getChild<LLButton>("info_btn");
+	mProfileBtn = getChild<LLButton>("profile_btn");
+
+	mLastInteractionTime->setVisible(false);
+	mIconPermissionOnline->setVisible(false);
+	mIconPermissionMap->setVisible(false);
+	mIconPermissionEditMine->setVisible(false);
+	mIconPermissionEditTheirs->setVisible(false);
+	mSpeakingIndicator->setVisible(false);
+	mInfoBtn->setVisible(false);
+	mProfileBtn->setVisible(false);
+
+	mInfoBtn->setClickedCallback(boost::bind(&LLSocialListItem::onInfoBtnClick, this));
+	mProfileBtn->setClickedCallback(boost::bind(&LLSocialListItem::onProfileBtnClick, this));
+
+	return TRUE;
+}
+
+void LLSocialListItem::setName(const std::string& name, const std::string& highlight)
+{
+	mLabel = name;
+	LLTextUtil::textboxSetHighlightedVal(mLabelTextBox, mLabelTextBoxStyle, name, highlight);
+}
+
+void LLSocialListItem::setValue(const LLSD& value)
+{
+	getChildView("selected_icon")->setVisible( value["selected"]);
+}
+
+void LLSocialListItem::onMouseEnter(S32 x, S32 y, MASK mask)
+{
+	getChildView("hovered_icon")->setVisible( true);
+	mInfoBtn->setVisible(true);
+	mProfileBtn->setVisible(true);
+
+	LLPanel::onMouseEnter(x, y, mask);
+}
+
+void LLSocialListItem::onMouseLeave(S32 x, S32 y, MASK mask)
+{
+	getChildView("hovered_icon")->setVisible( false);
+	mInfoBtn->setVisible(false);
+	mProfileBtn->setVisible(false);
+
+	LLPanel::onMouseLeave(x, y, mask);
+}
+
+void LLSocialListItem::onInfoBtnClick()
+{
+	LLFloaterReg::showInstance("inspect_avatar", LLSD().with("avatar_id", mAvatarId));
+}
+
+void LLSocialListItem::onProfileBtnClick()
+{
+	LLAvatarActions::showProfile(mAvatarId);
+}
diff --git a/indra/newview/llsociallist.h b/indra/newview/llsociallist.h
new file mode 100644
index 0000000000..bc667fc400
--- /dev/null
+++ b/indra/newview/llsociallist.h
@@ -0,0 +1,102 @@
+/** 
+* @file   llsociallist.h
+* @brief  Header file for llsociallist
+* @author Gilbert@lindenlab.com
+*
+* $LicenseInfo:firstyear=2013&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2013, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+#ifndef LL_LLSOCIALLIST_H
+#define LL_LLSOCIALLIST_H
+
+#include "llflatlistview.h"
+#include "llstyle.h"
+
+
+/**
+ * Generic list of avatars.
+ * 
+ * Updates itself when it's dirty, using optional name filter.
+ * To initiate update, modify the UUID list and call setDirty().
+ * 
+ * @see getIDs()
+ * @see setDirty()
+ * @see setNameFilter()
+ */
+
+class LLAvatarIconCtrl;
+class LLIconCtrl;
+class LLOutputMonitorCtrl;
+
+class LLSocialList : public LLFlatListViewEx
+{
+public:
+
+	struct Params : public LLInitParam::Block<Params, LLFlatListViewEx::Params>
+	{
+	};
+
+	LLSocialList(const Params&p);
+	virtual	~LLSocialList();
+
+	virtual void draw();
+	void refresh();
+	void addNewItem(const LLUUID& id, const std::string& name, BOOL is_online, EAddPosition pos = ADD_BOTTOM);
+
+
+
+	std::string mNameFilter;
+};
+
+class LLSocialListItem : public LLPanel
+{
+	public:
+	LLSocialListItem();
+	~LLSocialListItem();
+
+	BOOL postBuild();
+	void setName(const std::string& name, const std::string& highlight = LLStringUtil::null);
+	void setValue(const LLSD& value);
+	void onMouseEnter(S32 x, S32 y, MASK mask);
+	void onMouseLeave(S32 x, S32 y, MASK mask);
+	void onInfoBtnClick();
+	void onProfileBtnClick();
+
+	LLUUID mAvatarId;
+
+	LLTextBox * mLabelTextBox;
+	std::string mLabel;
+	LLStyle::Params mLabelTextBoxStyle;
+
+
+	LLAvatarIconCtrl * mIcon;
+	LLTextBox * mLastInteractionTime;
+	LLIconCtrl * mIconPermissionOnline;
+	LLIconCtrl * mIconPermissionMap;
+	LLIconCtrl * mIconPermissionEditMine;
+	LLIconCtrl * mIconPermissionEditTheirs;
+	LLOutputMonitorCtrl * mSpeakingIndicator;
+	LLButton * mInfoBtn;
+	LLButton * mProfileBtn;
+};	
+
+
+#endif // LL_LLSOCIALLIST_H
diff --git a/indra/newview/skins/default/xui/en/menu_gear_fbc.xml b/indra/newview/skins/default/xui/en/menu_gear_fbc.xml
new file mode 100644
index 0000000000..b05ba46107
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_gear_fbc.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu 
+     name="menu_group_plus"
+     left="0" bottom="0" visible="false"
+     mouse_opaque="false">
+  <menu_item_check
+   label="Facebook App Settings"
+   layout="topleft"
+   name="Facebook App Settings">
+      <menu_item_check.on_click
+       function="Advanced.WebContentTest"
+       parameter="http://www.facebook.com/settings?tab=applications" />
+  </menu_item_check>
+  <menu_item_check
+   label="Facebook App Request"
+   layout="topleft"
+   name="Facebook App Request">
+    <menu_item_check.on_click
+     function="People.requestFBC"
+     parameter="http://www.facebook.com/settings?tab=applications" />
+  </menu_item_check>
+  <menu_item_check
+   label="Facebook App Send"
+   layout="topleft"
+   name="Facebook App Send">
+    <menu_item_check.on_click
+     function="People.sendFBC"
+     parameter="http://www.facebook.com/settings?tab=applications" />
+  </menu_item_check>  
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index a11cd13fdb..39e777b246 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3018,6 +3018,13 @@
              parameter="http://google.com"/>
           </menu_item_call>
           <menu_item_call
+           label="FB Connect Test"
+           name="FB Connect Test">
+            <menu_item_call.on_click
+             function="Advanced.WebContentTest"
+             parameter="https://cryptic-ridge-1632.herokuapp.com/"/>
+          </menu_item_call>
+          <menu_item_call
              label="Dump SelectMgr"
              name="Dump SelectMgr">
                 <menu_item_call.on_click
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 7ce2627be9..08c8aef1e9 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -633,5 +633,97 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
            top="0"
            right="-1" />
         </panel>
+        <panel
+           background_opaque="true"
+           background_visible="true"
+           bg_alpha_color="DkGray"
+           bg_opaque_color="DkGray"
+           follows="all"
+           height="383"
+           label="FBC TEST"
+           layout="topleft"
+           left="0"
+           help_topic="people_fbctest_tab"
+           name="fbctest_panel"
+           top="0"
+           width="313">
+          <accordion
+                    background_visible="true"
+                    bg_alpha_color="DkGray2"
+                    bg_opaque_color="DkGray2"
+                      follows="all"
+                      height="356"
+                      layout="topleft"
+                      left="3"
+                      name="friends_accordion"
+                      top="0"
+                      width="307">
+            <accordion_tab
+             layout="topleft"
+             height="172"
+             min_height="150"
+             name="tab_facebook"
+             title="Facebook Friends">
+              <social_list
+               allow_select="true"
+               follows="all"
+               height="172"
+               layout="topleft"
+               left="0"
+               multi_select="true"
+               name="facebook_friends"
+               show_permissions_granted="true"
+               top="0"
+               width="307" />
+            </accordion_tab>
+          </accordion>
+          <panel
+           background_visible="true"
+           follows="left|right|bottom"
+           height="27"
+           label="bottom_panel"
+           layout="topleft"
+           left="3"
+           name="bottom_panel"
+           top_pad="0"
+           width="313">
+            <menu_button
+              follows="bottom|left"
+              tool_tip="Options"
+              height="25"
+              image_hover_unselected="Toolbar_Left_Over"
+              image_overlay="OptionsMenu_Off"
+              image_selected="Toolbar_Left_Selected"
+              image_unselected="Toolbar_Left_Off"
+              layout="topleft"
+              name="fbc_options_btn"
+              top="1"
+              width="31" />
+            <button
+               follows="bottom|left"
+               height="25"
+               image_hover_unselected="Toolbar_Middle_Over"
+               image_overlay="AddItem_Off"
+               image_selected="Toolbar_Middle_Selected"
+               image_unselected="Toolbar_Middle_Off"
+               layout="topleft"
+               left_pad="1"
+               name="fbc_login_btn"
+               tool_tip="Log in to FBC"
+               width="31">
+              <commit_callback
+                 function="People.loginFBC" />
+            </button>
+            <icon
+             follows="bottom|left|right"
+             height="25"
+             image_name="Toolbar_Right_Off"
+             layout="topleft"
+             left_pad="1"
+             name="dummy_icon"
+             width="244"
+             />
+          </panel>
+        </panel>
     </tab_container>
 </panel>