diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2010-03-18 17:45:35 +0200 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2010-03-18 17:45:35 +0200 |
| commit | 095cd1b639a969686ff5b9fadfce6b90f038590e (patch) | |
| tree | d1c093fcd3cbbe5d4a6713ac37b2a08ec5edca5d /indra | |
| parent | 00c4dabc2ba4052f66654c871f82f90e21500d9d (diff) | |
fixed EXT-6092 [crashhunters] Crash in LLFlatListView::selectItemPair
turned off commit on focus lost for the filter editor (Panel Places) in the code
Reviewed by Mike at https://codereview.productengine.com/secondlife/r/63/
--HG--
branch : product-engine
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/llsearcheditor.h | 2 | ||||
| -rw-r--r-- | indra/newview/llpanelplaces.cpp | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/indra/llui/llsearcheditor.h b/indra/llui/llsearcheditor.h index 714aca9337..785d0633dc 100644 --- a/indra/llui/llsearcheditor.h +++ b/indra/llui/llsearcheditor.h @@ -66,6 +66,8 @@ public: } }; + void setCommitOnFocusLost(BOOL b) { if (mSearchEditor) mSearchEditor->setCommitOnFocusLost(b); } + protected: LLSearchEditor(const Params&); friend class LLUICtrlFactory; diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp index 26b57c003b..f9ba6f625d 100644 --- a/indra/newview/llpanelplaces.cpp +++ b/indra/newview/llpanelplaces.cpp @@ -278,6 +278,11 @@ BOOL LLPanelPlaces::postBuild() mFilterEditor = getChild<LLFilterEditor>("Filter"); if (mFilterEditor) { + //when list item is being clicked the filter editor looses focus + //committing on focus lost leads to detaching list items + //BUT a detached list item cannot be made selected and must not be clicked onto + mFilterEditor->setCommitOnFocusLost(false); + mFilterEditor->setCommitCallback(boost::bind(&LLPanelPlaces::onFilterEdit, this, _2, false)); } |