diff options
| author | Mark Palange <palange@lindenlab.com> | 2008-10-20 22:16:40 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2008-10-20 22:16:40 +0000 |
| commit | 04decf22b9982aa8914024556ac11ce8c6f322a0 (patch) | |
| tree | 35cbcc906763bd3b2abccccd1864213cfa59f1de /indra/llui/llscrolllistctrl.cpp | |
| parent | d0e62db34ebda571db3ad78ca138275c4e84e47f (diff) | |
Merge 98702-99587 viewer_1-21 -> release Merging changes made between 1.21 RC5 secu-fix to 1.21.6 release.
Diffstat (limited to 'indra/llui/llscrolllistctrl.cpp')
| -rw-r--r-- | indra/llui/llscrolllistctrl.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index 275cc65976..ebfdda3027 100644 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -88,8 +88,7 @@ struct SortScrollListItem } } - // make sure to keep order when sort_result == 0 - return sort_result <= 0; + return sort_result < 0; } typedef std::vector<std::pair<S32, BOOL> > sort_order_t; |