diff options
| author | simon <none@none> | 2013-08-26 15:45:09 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-08-26 15:45:09 -0700 |
| commit | 90d1c5b3676fe4e8ea8668b41fdf92613d5f102d (patch) | |
| tree | 8d5afd9678fd44444bcc7b5d311b5cfb7abe5217 /indra/llui/llscrolllistctrl.cpp | |
| parent | ac2dc34ed0abbac8d5a8eb7f887037fe387c6a7a (diff) | |
| parent | 27d637d0f14fdfff496256222dc1343d2d7ee9ae (diff) | |
Merge downstream code for CHUIStorm
Diffstat (limited to 'indra/llui/llscrolllistctrl.cpp')
| -rwxr-xr-x | indra/llui/llscrolllistctrl.cpp | 4 |
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) |