summaryrefslogtreecommitdiff
path: root/indra/llui/llscrolllistctrl.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-06-10 15:16:08 -0500
committerDave Parks <davep@lindenlab.com>2010-06-10 15:16:08 -0500
commitaab53dc25021dfb9b0a734480233e352a82486cd (patch)
treede9c71677f9955112c0b01bf8c064404bd862f53 /indra/llui/llscrolllistctrl.cpp
parent1d92a950df91d7e6d3a34e925f445bc389a3fa93 (diff)
parent3ea0018dc6f94c029d7dbf13bdd5b0bc0558c8d8 (diff)
merge
Diffstat (limited to 'indra/llui/llscrolllistctrl.cpp')
-rw-r--r--indra/llui/llscrolllistctrl.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index 94eade06ad..d4d161f2c9 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -2949,7 +2949,6 @@ BOOL LLScrollListCtrl::operateOnAll(EOperation op)
//virtual
void LLScrollListCtrl::setFocus(BOOL b)
{
- mSearchString.clear();
// for tabbing into pristine scroll lists (Finder)
if (!getFirstSelected())
{
@@ -2994,6 +2993,9 @@ void LLScrollListCtrl::onFocusLost()
{
gFocusMgr.setMouseCapture(NULL);
}
+
+ mSearchString.clear();
+
LLUICtrl::onFocusLost();
}