summaryrefslogtreecommitdiff
path: root/indra/llui/llscrolllistctrl.cpp
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2013-08-28 18:30:38 -0700
committerGilbert Gonzales <gilbert@lindenlab.com>2013-08-28 18:30:38 -0700
commitc767354a204a7618e7ceb3650a0516dcde519a8d (patch)
tree6b258169b67cc4986814ba0f5901760038c539d7 /indra/llui/llscrolllistctrl.cpp
parent6c45b3677ee06cd58056447a4b7b45fa78df8b74 (diff)
parent6e1138585bf745f73f0bb99ca62f77eeb273f1e4 (diff)
merging viewer release
Diffstat (limited to 'indra/llui/llscrolllistctrl.cpp')
-rwxr-xr-xindra/llui/llscrolllistctrl.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index 4adfd42edd..6e03f604a2 100755
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -1183,10 +1183,10 @@ LLScrollListItem* LLScrollListCtrl::addSeparator(EAddPosition pos)
// Selects first enabled item of the given name.
// Returns false if item not found.
// Calls getItemByLabel in order to combine functionality
-BOOL LLScrollListCtrl::selectItemByLabel(const std::string& label, BOOL case_sensitive)
+BOOL LLScrollListCtrl::selectItemByLabel(const std::string& label, BOOL case_sensitive, S32 column/* = 0*/)
{
deselectAllItems(TRUE); // ensure that no stale items are selected, even if we don't find a match
- LLScrollListItem* item = getItemByLabel(label, case_sensitive);
+ LLScrollListItem* item = getItemByLabel(label, case_sensitive, column);
bool found = NULL != item;
if(found)