summaryrefslogtreecommitdiff
path: root/indra/llui/llscrolllistctrl.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-06-01 18:34:35 -0700
committerRichard Linden <none@none>2010-06-01 18:34:35 -0700
commitbf8e93c6dcd73dfcf6693391e8c0812c90cf2c57 (patch)
tree047423c2abd5362d314323c958fce3e69a9a2f4a /indra/llui/llscrolllistctrl.cpp
parentb6250ac93afb61fcba9848b1516631af8fe53bc6 (diff)
parent8beb651d764032e47b976b7495a048174936e1e6 (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();
}