diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-20 13:54:34 -0800 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-20 13:54:34 -0800 |
commit | a65188d85f75e848d224bd335a00ed8aa51f945e (patch) | |
tree | f43b390cba45d047fc0fa31659f6969f62b925d1 /indra/newview/llpanelgroup.cpp | |
parent | 1a8008ea150d1eb9a8f4036988ef971fb1901cb3 (diff) | |
parent | 5ca943cd0279d35ffdf584fa0de3b795645f276c (diff) |
Merge from viewer2. Minor conflict resolved.
Diffstat (limited to 'indra/newview/llpanelgroup.cpp')
-rw-r--r-- | indra/newview/llpanelgroup.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llpanelgroup.cpp b/indra/newview/llpanelgroup.cpp index daec793d75..01291c4012 100644 --- a/indra/newview/llpanelgroup.cpp +++ b/indra/newview/llpanelgroup.cpp @@ -419,9 +419,9 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id) if(tab_land->getDisplayChildren()) tab_land->changeOpenClose(tab_land->getDisplayChildren()); - tab_roles->canOpenClose(false); - tab_notices->canOpenClose(false); - tab_land->canOpenClose(false); + tab_roles->setVisible(false); + tab_notices->setVisible(false); + tab_land->setVisible(false); getChild<LLUICtrl>("group_name")->setVisible(false); getChild<LLUICtrl>("group_name_editor")->setVisible(true); @@ -443,9 +443,9 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id) LLGroupData agent_gdatap; bool is_member = gAgent.getGroupData(mID,agent_gdatap); - tab_roles->canOpenClose(is_member); - tab_notices->canOpenClose(is_member); - tab_land->canOpenClose(is_member); + tab_roles->setVisible(is_member); + tab_notices->setVisible(is_member); + tab_land->setVisible(is_member); getChild<LLUICtrl>("group_name")->setVisible(true); getChild<LLUICtrl>("group_name_editor")->setVisible(false); |