diff options
| author | Anchor Linden <anchor@lindenlab.com> | 2018-06-27 17:45:35 +0530 |
|---|---|---|
| committer | Anchor Linden <anchor@lindenlab.com> | 2018-06-27 17:45:35 +0530 |
| commit | b48ca9da4786015f23d265f59f97110b48d0d22f (patch) | |
| tree | c168dbb2e068bf8bdd96c703b178b783b8e03bfd /indra/newview/llpanelgroup.cpp | |
| parent | a0beacf007b9e99b7d92647ebb31307d77eec51f (diff) | |
| parent | dc07de2f4a4c49d1877bf743b6f0d209392f6eb6 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llpanelgroup.cpp')
| -rw-r--r-- | indra/newview/llpanelgroup.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/indra/newview/llpanelgroup.cpp b/indra/newview/llpanelgroup.cpp index 342b57ba4a..e41211ddbd 100644 --- a/indra/newview/llpanelgroup.cpp +++ b/indra/newview/llpanelgroup.cpp @@ -159,9 +159,6 @@ BOOL LLPanelGroup::postBuild() button = getChild<LLButton>("btn_chat"); button->setClickedCallback(onBtnGroupChatClicked, this); - button = getChild<LLButton>("btn_cancel"); - button->setVisible(false); button->setEnabled(true); - button = getChild<LLButton>("btn_refresh"); button->setClickedCallback(onBtnRefresh, this); @@ -170,8 +167,6 @@ BOOL LLPanelGroup::postBuild() childSetCommitCallback("back",boost::bind(&LLPanelGroup::onBackBtnClick,this),NULL); childSetCommitCallback("btn_create",boost::bind(&LLPanelGroup::onBtnCreate,this),NULL); - - childSetCommitCallback("btn_cancel",boost::bind(&LLPanelGroup::onBtnCancel,this),NULL); LLPanelGroupTab* panel_general = findChild<LLPanelGroupTab>("group_general_tab_panel"); LLPanelGroupTab* panel_roles = findChild<LLPanelGroupTab>("group_roles_tab_panel"); @@ -299,11 +294,6 @@ void LLPanelGroup::onBtnJoin() LLGroupActions::join(mID); } -void LLPanelGroup::onBtnCancel() -{ - onBackBtnClick(); -} - void LLPanelGroup::changed(LLGroupChange gc) { for(std::vector<LLPanelGroupTab* >::iterator it = mTabs.begin();it!=mTabs.end();++it) |