summaryrefslogtreecommitdiff
path: root/indra/llui/llflatlistview.cpp
diff options
context:
space:
mode:
authorKent Quirk <q@lindenlab.com>2010-03-23 23:02:02 -0400
committerKent Quirk <q@lindenlab.com>2010-03-23 23:02:02 -0400
commit62ebb4533ceff1d0a7cf68a6385a8d3b34fa51d4 (patch)
treedd6cd1b313f933847c6e603d50a65ffbc82fee01 /indra/llui/llflatlistview.cpp
parent3ad56f22158dd2665204745af2171689f208cd7e (diff)
parentea8f1b80df0fcfcdbb52123b2ece68916ed139ff (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);