diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-02 07:52:41 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-02 07:52:41 +0100 |
commit | 9354571174af49849b56b5cc2a81c8d65f59cdfe (patch) | |
tree | b58806fc9fad9c38a48d6d9d042bad0cbf308f80 /indra/llui/llscrolllistctrl.cpp | |
parent | 605a4a459e23073814e8ce18c8e9997a9e01fab0 (diff) | |
parent | 813d4cc8a336e0ef66d0f368269f5c10d9817c59 (diff) |
merge.
Diffstat (limited to 'indra/llui/llscrolllistctrl.cpp')
-rw-r--r-- | indra/llui/llscrolllistctrl.cpp | 4 |
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(); } |