summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2018-08-02 16:36:50 -0400
committerOz Linden <oz@lindenlab.com>2018-08-02 16:36:50 -0400
commit5e8995220304a105d821eb3bccd8be484520174a (patch)
tree9b4ba9044ba7f98a38865fc854914e6b9e248486 /indra/llui
parentc339894390af70b32cef3fca258b9a19ce4aeb20 (diff)
parent09f97172bb478a2c977d8b7b0958196e7e98c433 (diff)
merge changes for 5.1.7-release
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llscrolllistctrl.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index 212e27477b..ed65b1e45f 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -2784,7 +2784,6 @@ void LLScrollListCtrl::onClickColumn(void *userdata)
}
// if this column is the primary sort key, reverse the direction
- sort_column_t cur_sort_column;
if (!parent->mSortColumns.empty() && parent->mSortColumns.back().first == column_index)
{
ascending = !parent->mSortColumns.back().second;