summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorWilliam Todd Stinson <stinson@lindenlab.com>2012-10-23 14:16:49 -0700
committerWilliam Todd Stinson <stinson@lindenlab.com>2012-10-23 14:16:49 -0700
commit873d03e96f8fe10705e99a5ef1c1baca96fb2325 (patch)
tree94914fe6a2eaf5d748dbfea62c75de06afa95e96 /indra/llui
parent52a8ea96a1b9ad52a01c4617de63f8cc1bec1e31 (diff)
parenta780eb1a92811c2531c2fc1d211e8e5dd03da103 (diff)
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llfolderview.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp
index c8b8bcae48..c31a832141 100644
--- a/indra/llui/llfolderview.cpp
+++ b/indra/llui/llfolderview.cpp
@@ -505,7 +505,7 @@ void LLFolderView::sanitizeSelection()
// ensure that each ancestor is open and potentially passes filtering
BOOL visible = false;
- if(item->getViewModelItem())
+ if(item->getViewModelItem() != NULL)
{
visible = item->getViewModelItem()->potentiallyVisible(); // initialize from filter state for this item
}