diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-10-19 17:42:22 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-10-19 17:42:22 -0700 |
| commit | 730ba97759deabd7fb45e63eae650f83c1d9ba99 (patch) | |
| tree | 2d484050ef7942ffdad6ec4636a0d35e43158917 /indra/llui/llfolderview.cpp | |
| parent | e6a7133ef1fa1760e0bfb53f5b14e7b6e76da0f5 (diff) | |
| parent | 0356ef61cf9f70b97dc78a59fba58465d99f5fc0 (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/llui/llfolderview.cpp')
| -rw-r--r-- | indra/llui/llfolderview.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp index c1a11851e2..c8b8bcae48 100644 --- a/indra/llui/llfolderview.cpp +++ b/indra/llui/llfolderview.cpp @@ -504,7 +504,11 @@ void LLFolderView::sanitizeSelection() LLFolderViewItem* item = *item_iter; // ensure that each ancestor is open and potentially passes filtering - BOOL visible = item->getViewModelItem()->potentiallyVisible(); // initialize from filter state for this item + BOOL visible = false; + if(item->getViewModelItem()) + { + visible = item->getViewModelItem()->potentiallyVisible(); // initialize from filter state for this item + } // modify with parent open and filters states LLFolderViewFolder* parent_folder = item->getParentFolder(); // Move up through parent folders and see what's visible |