diff options
author | Monroe Linden <monroe@lindenlab.com> | 2010-08-27 16:58:33 -0700 |
---|---|---|
committer | Monroe Linden <monroe@lindenlab.com> | 2010-08-27 16:58:33 -0700 |
commit | b62b10dd260c8c01e82e5b206c17a410cedc79f4 (patch) | |
tree | 2ea582bb63476566ddabfbd5a0a8f3747eb3fc8e /indra/newview/llfloatergroups.cpp | |
parent | bef304c0a34bfcd7997bd7799995229ddcc1de31 (diff) | |
parent | 51311875b6e23fa9475c42b6d15637aa668729c5 (diff) |
Post-convert merge by convert_monolith.py from ./viewer-experience
Diffstat (limited to 'indra/newview/llfloatergroups.cpp')
-rw-r--r-- | indra/newview/llfloatergroups.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llfloatergroups.cpp b/indra/newview/llfloatergroups.cpp index 3cd2154531..234a09d157 100644 --- a/indra/newview/llfloatergroups.cpp +++ b/indra/newview/llfloatergroups.cpp @@ -338,11 +338,10 @@ void LLPanelGroups::onGroupList(LLUICtrl* ctrl, void* userdata) if(self) self->enableButtons(); } -void init_group_list(LLScrollListCtrl* ctrl, const LLUUID& highlight_id, U64 powers_mask) +void init_group_list(LLScrollListCtrl* group_list, const LLUUID& highlight_id, U64 powers_mask) { S32 count = gAgent.mGroups.count(); LLUUID id; - LLCtrlListInterface *group_list = ctrl->getListInterface(); if (!group_list) return; group_list->operateOnAll(LLCtrlListInterface::OP_DELETE); @@ -366,10 +365,12 @@ void init_group_list(LLScrollListCtrl* ctrl, const LLUUID& highlight_id, U64 pow element["columns"][0]["font"]["name"] = "SANSSERIF"; element["columns"][0]["font"]["style"] = style; - group_list->addElement(element, ADD_SORTED); + group_list->addElement(element); } } + group_list->sortOnce(0, TRUE); + // add "none" to list at top { std::string style = "NORMAL"; |