diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-01 14:56:05 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-01 14:56:05 -0700 |
| commit | 4cb8f69c106aabf02331620438c764d1c22e9d93 (patch) | |
| tree | 0a24a98773ab96804bb8ec7da334edbfb0f68592 /indra/llui | |
| parent | 0f1c2f8aba148aa7e594d4c9e1bc6a95d34bd99b (diff) | |
| parent | 7f2ea292e10b10958b3e00a641b50b194f131e41 (diff) | |
merging in latest changes
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llfolderview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp index c31a832141..a33ffc4240 100644 --- a/indra/llui/llfolderview.cpp +++ b/indra/llui/llfolderview.cpp @@ -566,7 +566,7 @@ void LLFolderView::sanitizeSelection() parent_folder; parent_folder = parent_folder->getParentFolder()) { - if (parent_folder->getViewModelItem()->potentiallyVisible()) + if (parent_folder->getViewModelItem() && parent_folder->getViewModelItem()->potentiallyVisible()) { // give initial selection to first ancestor folder that potentially passes the filter if (!new_selection) |