diff options
| author | Andrew Polunin <apolunin@productengine.com> | 2009-11-06 17:00:26 +0200 |
|---|---|---|
| committer | Andrew Polunin <apolunin@productengine.com> | 2009-11-06 17:00:26 +0200 |
| commit | 30fe1aa19715076be2cef2f3cf78a79b6343c9ba (patch) | |
| tree | bdf8483ab37d3df30e2dd9403242aaec4d7dc9fa /indra/newview | |
| parent | 4b804902229f610156920333dfb18f2f3fabf12b (diff) | |
fixed normal bug EXT-2193 Group Profile, Group Chat bttns and Profile chevron are enabled for None Group
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llgrouplist.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/llpanelpeople.cpp | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/llgrouplist.cpp b/indra/newview/llgrouplist.cpp index 2e2b2d5101..010ed23918 100644 --- a/indra/newview/llgrouplist.cpp +++ b/indra/newview/llgrouplist.cpp @@ -183,6 +183,11 @@ void LLGroupList::addNewItem(const LLUUID& id, const std::string& name, const LL item->childSetVisible("info_btn", false); item->setGroupIconVisible(mShowIcons); + if (id.isNull()) + { + item->childSetVisible("profile_btn", false); + } + addItem(item, id, pos); // setCommentVisible(false); diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp index 65a7b5322b..bb6cdd2f78 100644 --- a/indra/newview/llpanelpeople.cpp +++ b/indra/newview/llpanelpeople.cpp @@ -667,8 +667,10 @@ void LLPanelPeople::updateButtons() buttonSetEnabled("im_btn", (selected_uuids.size() >= 1)); // allow starting the friends conference for multiple selection buttonSetEnabled("call_btn", item_selected && false); // not implemented yet buttonSetEnabled("share_btn", item_selected && false); // not implemented yet - buttonSetEnabled("group_info_btn", item_selected); - buttonSetEnabled("chat_btn", item_selected); + + bool none_group_selected = item_selected && selected_id.isNull(); + buttonSetEnabled("group_info_btn", !none_group_selected); + buttonSetEnabled("chat_btn", !none_group_selected); } std::string LLPanelPeople::getActiveTabName() const |