summaryrefslogtreecommitdiff
path: root/indra/llui/llflatlistview.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-03-10 10:31:41 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-03-10 10:31:41 +0000
commit8229fdd4902012c2d87cdd0264ad30de5cd7e0fa (patch)
tree83c7138949312de0ba2d89557807ff555f23a907 /indra/llui/llflatlistview.cpp
parentd6547a9b84695b994eef5425d62d19929478109a (diff)
parentbc852b9a5dcffcec4cbf15b5cc4e571f8970c125 (diff)
merge from viewer-2-0
Diffstat (limited to 'indra/llui/llflatlistview.cpp')
-rw-r--r--indra/llui/llflatlistview.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llui/llflatlistview.cpp b/indra/llui/llflatlistview.cpp
index 2481249f91..2e5aeec41d 100644
--- a/indra/llui/llflatlistview.cpp
+++ b/indra/llui/llflatlistview.cpp
@@ -492,6 +492,12 @@ void LLFlatListView::onItemMouseClick(item_pair_t* item_pair, MASK mask)
{
if (!item_pair) return;
+ if (!item_pair->first)
+ {
+ llwarning("Attempt to selet an item pair containing null panel item", 0);
+ return;
+ }
+
setFocus(TRUE);
bool select_item = !isSelected(item_pair);