diff options
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llpanelpeople.cpp | 34 | ||||
| -rwxr-xr-x | indra/newview/llpanelpeople.h | 7 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_gear_fbc.xml | 44 |
3 files changed, 0 insertions, 85 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 diff --git a/indra/newview/llpanelpeople.h b/indra/newview/llpanelpeople.h index db8eddb376..666702a08c 100755 --- a/indra/newview/llpanelpeople.h +++ b/indra/newview/llpanelpeople.h @@ -111,10 +111,6 @@ 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); @@ -147,15 +143,12 @@ private: std::vector<std::string> mSavedOriginalFilters; std::vector<std::string> mSavedFilters; - LLHandle<LLView> mFBCMenuHandle; - LLHandle<LLFloater> mFbcTestBrowserHandle; Updater* mFriendListUpdater; Updater* mNearbyListUpdater; Updater* mRecentListUpdater; Updater* mFacebookListUpdater; Updater* mButtonsUpdater; - LLMenuButton* mFBCGearButton; LLHandle< LLFloater > mPicker; }; diff --git a/indra/newview/skins/default/xui/en/menu_gear_fbc.xml b/indra/newview/skins/default/xui/en/menu_gear_fbc.xml deleted file mode 100644 index cf27f528ee..0000000000 --- a/indra/newview/skins/default/xui/en/menu_gear_fbc.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?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> - <menu_item_check - 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> |