summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2010-03-16 12:33:25 -0700
committerRoxie Linden <roxie@lindenlab.com>2010-03-16 12:33:25 -0700
commit60c4621500e478d66a8bdc3a1c80573be2860fee (patch)
treefa10b52caf3a54e03502058cd52d77952370cb34 /indra/llui
parent2e525711cd08d5f1dce991d1b6595a8dd41c9e3b (diff)
parentba414d500ca8cb88da530c89ba373c95195ce633 (diff)
Automated merge from viewer/viewer-2-0
Diffstat (limited to 'indra/llui')
-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);