diff options
| author | Jacek Antonelli | 2008-10-17 20:01:38 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-10-17 20:01:38 -0500 |
| commit | fdf944fb0355249d73c4e25ee86e9ffd378e7d4b (patch) | |
| tree | 2e5c51fe0e6d5757f984721e01cc097801d927e7 /linden/indra/llui/llcombobox.cpp | |
| parent | Rebranded Windows-specific installer/support files. (diff) | |
| parent | Updated source to SL version 1.21.6. (diff) | |
| download | meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.zip meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.gz meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.bz2 meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.xz | |
Merge branch 'merge-1.21.6' into rebranding
Conflicts:
linden/indra/newview/installers/windows/installer_template.nsi
linden/indra/newview/llappviewer.cpp
Diffstat (limited to 'linden/indra/llui/llcombobox.cpp')
| -rw-r--r-- | linden/indra/llui/llcombobox.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/llui/llcombobox.cpp b/linden/indra/llui/llcombobox.cpp index 48050db..9a2e13b 100644 --- a/linden/indra/llui/llcombobox.cpp +++ b/linden/indra/llui/llcombobox.cpp | |||
| @@ -296,9 +296,9 @@ LLScrollListItem* LLComboBox::addSeparator(EAddPosition pos) | |||
| 296 | return mList->addSeparator(pos); | 296 | return mList->addSeparator(pos); |
| 297 | } | 297 | } |
| 298 | 298 | ||
| 299 | void LLComboBox::sortByName() | 299 | void LLComboBox::sortByName(BOOL ascending) |
| 300 | { | 300 | { |
| 301 | mList->sortByColumnIndex(0, TRUE); | 301 | mList->sortOnce(0, ascending); |
| 302 | } | 302 | } |
| 303 | 303 | ||
| 304 | 304 | ||