diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-07-09 13:43:24 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-07-09 13:43:24 -0700 |
| commit | e414dfad51b3747fa20c0023820980f23f1cad2c (patch) | |
| tree | 403a5c6aa5a8d74606c740dae7b5aad106c795b6 /indra/newview/llpanelgroup.cpp | |
| parent | dd309984d7566710b9ceaf8f6edf2de1672f4f9c (diff) | |
| parent | f804bcadb18488d36a97dc1f3a9ca2e4b1f7f039 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llpanelgroup.cpp')
| -rwxr-xr-x | indra/newview/llpanelgroup.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llpanelgroup.cpp b/indra/newview/llpanelgroup.cpp index 8936084d97..f67a90fd01 100755 --- a/indra/newview/llpanelgroup.cpp +++ b/indra/newview/llpanelgroup.cpp @@ -420,6 +420,7 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id) LLAccordionCtrlTab* tab_roles = getChild<LLAccordionCtrlTab>("group_roles_tab"); LLAccordionCtrlTab* tab_notices = getChild<LLAccordionCtrlTab>("group_notices_tab"); LLAccordionCtrlTab* tab_land = getChild<LLAccordionCtrlTab>("group_land_tab"); + LLAccordionCtrlTab* tab_experiences = getChild<LLAccordionCtrlTab>("group_experiences_tab"); if(mButtonJoin) mButtonJoin->setVisible(false); @@ -436,10 +437,13 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id) tab_notices->changeOpenClose(tab_notices->getDisplayChildren()); if(tab_land->getDisplayChildren()) tab_land->changeOpenClose(tab_land->getDisplayChildren()); + if(tab_experiences->getDisplayChildren()) + tab_experiences->changeOpenClose(tab_land->getDisplayChildren()); tab_roles->setVisible(false); tab_notices->setVisible(false); tab_land->setVisible(false); + tab_experiences->setVisible(false); getChild<LLUICtrl>("group_name")->setVisible(false); getChild<LLUICtrl>("group_name_editor")->setVisible(true); @@ -461,6 +465,8 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id) tab_notices->changeOpenClose(tab_notices->getDisplayChildren()); if(tab_land->getDisplayChildren()) tab_land->changeOpenClose(tab_land->getDisplayChildren()); + if(tab_experiences->getDisplayChildren()) + tab_experiences->changeOpenClose(tab_land->getDisplayChildren()); } LLGroupData agent_gdatap; @@ -469,6 +475,7 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id) tab_roles->setVisible(is_member); tab_notices->setVisible(is_member); tab_land->setVisible(is_member); + tab_experiences->setVisible(is_member); getChild<LLUICtrl>("group_name")->setVisible(true); getChild<LLUICtrl>("group_name_editor")->setVisible(false); @@ -536,6 +543,7 @@ bool LLPanelGroup::apply() && apply(findChild<LLPanelGroupTab>("group_roles_tab_panel")) && apply(findChild<LLPanelGroupTab>("group_notices_tab_panel")) && apply(findChild<LLPanelGroupTab>("group_land_tab_panel")) + && apply(findChild<LLPanelGroupTab>("group_experiences_tab_panel")) ; } |