summaryrefslogtreecommitdiff
path: root/indra/llui/llflatlistview.cpp
diff options
context:
space:
mode:
authorAlexei Arabadji <aarabadji@productengine.com>2010-03-16 15:02:58 +0200
committerAlexei Arabadji <aarabadji@productengine.com>2010-03-16 15:02:58 +0200
commit3874823bd8a388979bad2d882d5d52bffb8d78da (patch)
treecb9713a19e8b9670cda7a5ec16b93f1e92b39584 /indra/llui/llflatlistview.cpp
parent2fed8d5182813e2077522bb5bbb2cc565b5c283d (diff)
parenta872814de964ebcbf40e812f79319a13a54e2336 (diff)
Merge from viewer-2-0
--HG-- branch : product-engine
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);