diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-09-24 11:23:07 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-09-24 11:23:07 -0700 |
| commit | b85cf7b12562a3359e52147d26eb1051ce388559 (patch) | |
| tree | 3f656bb586e7cd2a25763d8053365e106365a063 /indra/newview/llfloatergroups.cpp | |
| parent | 24473fc0d619beaafab029170a7aacde5855be1a (diff) | |
| parent | b34856d66dfa1a725cb85d813982709566b6db7a (diff) | |
Pull update from viewer-development
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"; |