From ca74562a398d487245b112b1ea4cb5baa8ed00d3 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Sat, 9 Mar 2013 01:51:53 +0000
Subject: ACME-98 FIX Create a FB Login button in FB tab in People panel

---
 indra/newview/llpanelpeople.cpp                    |  6 +++
 indra/newview/llpanelpeople.h                      |  2 +
 .../newview/skins/default/xui/en/panel_people.xml  | 60 +++++++++++++++++++++-
 3 files changed, 67 insertions(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index 903574e8bd..85f54b06eb 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -513,6 +513,7 @@ LLPanelPeople::LLPanelPeople()
 	mRecentListUpdater = new LLRecentListUpdater(boost::bind(&LLPanelPeople::updateRecentList,	this));
 	mButtonsUpdater = new LLButtonsUpdater(boost::bind(&LLPanelPeople::updateButtons, this));
 	mCommitCallbackRegistrar.add("People.addFriend", boost::bind(&LLPanelPeople::onAddFriendButtonClicked, this));
+	mCommitCallbackRegistrar.add("People.loginFBC", boost::bind(&LLPanelPeople::onLoginFbcButtonClicked, this));
 }
 
 LLPanelPeople::~LLPanelPeople()
@@ -1561,4 +1562,9 @@ bool LLPanelPeople::isAccordionCollapsedByUser(const std::string& name)
 	return isAccordionCollapsedByUser(getChild<LLUICtrl>(name));
 }
 
+void LLPanelPeople::onLoginFbcButtonClicked()
+{
+	LLWeb::loadURLInternal("https://cryptic-ridge-1632.herokuapp.com/");
+}
+
 // EOF
diff --git a/indra/newview/llpanelpeople.h b/indra/newview/llpanelpeople.h
index 46c58cd139..4df5df2574 100644
--- a/indra/newview/llpanelpeople.h
+++ b/indra/newview/llpanelpeople.h
@@ -112,6 +112,8 @@ private:
 	void					onNearbyViewSortMenuItemClicked(const LLSD& userdata);
 	void					onGroupsViewSortMenuItemClicked(const LLSD& userdata);
 	void					onRecentViewSortMenuItemClicked(const LLSD& userdata);
+	
+	void					onLoginFbcButtonClicked();
 
 	//returns false only if group is "none"
 	bool					isRealGroup();
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 5c698c5048..781a1d773f 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -573,7 +573,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
         </panel>
         <panel
            background_opaque="true"
-         background_visible="true"
+           background_visible="true"
            bg_alpha_color="DkGray"
            bg_opaque_color="DkGray"
            follows="all"
@@ -585,6 +585,64 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
            name="fbctest_panel"
            top="0"
            width="313">
+          <avatar_list
+            allow_select="true"
+            follows="all"
+            height="356"
+            layout="topleft"
+            left="3"
+            multi_select="true"
+            name="avatar_list"
+            show_last_interaction_time="true"
+            top="0"
+            width="307" />
+          <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
-- 
cgit v1.2.3