summaryrefslogtreecommitdiff
path: root/indra/llui/llscrolllistctrl.cpp
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2010-06-04 13:58:18 +0300
committerYuri Chebotarev <ychebotarev@productengine.com>2010-06-04 13:58:18 +0300
commit15711b29afd293acd23d948a51ea65795335c95f (patch)
tree8fdbb8e7275ed5d16a19d8bc3434b69d687b0b61 /indra/llui/llscrolllistctrl.cpp
parent9345f01d4b61f857ed540cf725c8cd0ee1b0ef24 (diff)
parente1189d0e2ee47539edc68c3532e0a5ce64d5dcd1 (diff)
merge
--HG-- branch : product-engine
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();
}