diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-22 10:35:35 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-22 10:35:35 -0700 |
| commit | 520a29962081cb420341d8c40925569c20cadc2a (patch) | |
| tree | 39a64ebc7473fdedd9eaef0abc656d448653708b /indra/llui/llfolderview.cpp | |
| parent | b0c54dfd3e2ecc8d4f875276397a55cef40a3d9a (diff) | |
| parent | 730ba97759deabd7fb45e63eae650f83c1d9ba99 (diff) | |
merging in latest changes
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 |