diff options
| author | Richard Linden <none@none> | 2012-07-04 00:30:00 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-07-04 00:30:00 -0700 |
| commit | d3edb1c466f42e2c46c77e43b26d700c6298b8d6 (patch) | |
| tree | 0aababfb27cf540d9e2a5eea1316c47fb3351f1c /indra/llui | |
| parent | 1494a1058f41c5aa00a8ed08fe71123f63e92e81 (diff) | |
CHUI-101 WIP Make LLFolderview general purpose
partial fix for crash on startup
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llfolderview.cpp | 4 | ||||
| -rw-r--r-- | indra/llui/llfolderviewitem.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp index 0d3bc44ae4..990b79a30b 100644 --- a/indra/llui/llfolderview.cpp +++ b/indra/llui/llfolderview.cpp @@ -1798,8 +1798,8 @@ void LLFolderView::update() BOOL filter_finished = getViewModelItem()->passedFilter() && mViewModel->contentsReady(); if (filter_finished - || gFocusMgr.childHasKeyboardFocus(getParent()) // assume we are inside a scroll container - || gFocusMgr.childHasMouseCapture(getParent())) + || gFocusMgr.childHasKeyboardFocus(mParentPanel) + || gFocusMgr.childHasMouseCapture(mParentPanel)) { // finishing the filter process, giving focus to the folder view, or dragging the scrollbar all stop the auto select process mNeedsAutoSelect = FALSE; diff --git a/indra/llui/llfolderviewitem.h b/indra/llui/llfolderviewitem.h index 9cb885066a..50d3e0580e 100644 --- a/indra/llui/llfolderviewitem.h +++ b/indra/llui/llfolderviewitem.h @@ -53,7 +53,7 @@ public: { Optional<LLUIImage*> folder_arrow_image, selection_image; - Optional<LLFolderView*> root; + Mandatory<LLFolderView*> root; Mandatory<LLFolderViewModelItem*> listener; Optional<S32> folder_indentation, // pixels |