diff options
author | Cho <cho@lindenlab.com> | 2013-07-02 01:58:40 +0100 |
---|---|---|
committer | Cho <cho@lindenlab.com> | 2013-07-02 01:58:40 +0100 |
commit | 0ecfc4a1861fded92b4e24741622e0656a0e3b90 (patch) | |
tree | 6f7d442b5d0c34f969bd2cf84ee770a93d2b6609 /indra/newview/llpanelpeople.cpp | |
parent | f04c88493fe69d608a82f453248f38be2882fe3a (diff) |
removed remaining FBC test stuff from llpanelpeople.cpp for ACME-661
Diffstat (limited to 'indra/newview/llpanelpeople.cpp')
-rwxr-xr-x | indra/newview/llpanelpeople.cpp | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp index 6568b7054e..bd4813f945 100755 --- a/indra/newview/llpanelpeople.cpp +++ b/indra/newview/llpanelpeople.cpp @@ -518,10 +518,6 @@ LLPanelPeople::LLPanelPeople() mRecentListUpdater = new LLRecentListUpdater(boost::bind(&LLPanelPeople::updateRecentList, 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)); @@ -553,8 +549,6 @@ LLPanelPeople::~LLPanelPeople() { LLVoiceClient::getInstance()->removeObserver(this); } - - if (mFbcTestBrowserHandle.get()) mFbcTestBrowserHandle.get()->die(); } void LLPanelPeople::onFriendsAccordionExpandedCollapsed(LLUICtrl* ctrl, const LLSD& param, LLAvatarList* avatar_list) @@ -687,15 +681,6 @@ 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 @@ -1540,24 +1525,5 @@ bool LLPanelPeople::isAccordionCollapsedByUser(const std::string& name) return isAccordionCollapsedByUser(getChild<LLUICtrl>(name)); } -void LLPanelPeople::onLoginFbcButtonClicked() -{ - if (LLFacebookConnect::instance().isConnected()) - { - LLFacebookConnect::instance().disconnectFromFacebook(); - } - else - { - LLFacebookConnect::instance().getConnectionToFacebook(true); - } -} - -void LLPanelPeople::onFacebookAppRequestClicked() -{ -} - -void LLPanelPeople::onFacebookAppSendClicked() -{ -} // EOF |