summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-03-10 11:33:43 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-03-10 11:33:43 +0000
commite65f9452436bcfaebc19ddeecb29254a75e4d2b4 (patch)
treec06289477e02126368b0713956461e109781c603 /indra/llui
parentd0d1534e34a544a2a2acc9993421f587bb4f6ede (diff)
parentbc852b9a5dcffcec4cbf15b5cc4e571f8970c125 (diff)
merge from 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);