diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2010-01-06 14:29:26 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2010-01-06 14:29:26 -0500 |
commit | 657cbc3b74f0005290faf852e97d697296374566 (patch) | |
tree | c37c60962641816531e3d735a79df60b5b067e9b /indra/llui/llflatlistview.cpp | |
parent | 0f89155e295f632187704999d8ecc01f464a88d8 (diff) | |
parent | af61dd45b3afe8b62dceeb55a2ded7a9cfa34117 (diff) |
Merge previously-unmerged product-engine commit
Diffstat (limited to 'indra/llui/llflatlistview.cpp')
-rw-r--r-- | indra/llui/llflatlistview.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llflatlistview.cpp b/indra/llui/llflatlistview.cpp index 3754d155cf..9cfc67af14 100644 --- a/indra/llui/llflatlistview.cpp +++ b/indra/llui/llflatlistview.cpp @@ -906,7 +906,8 @@ void LLFlatListView::notifyParentItemsRectChanged() params["width"] = req_rect.getWidth(); params["height"] = req_rect.getHeight(); - getParent()->notifyParent(params); + if (getParent()) // dummy widgets don't have a parent + getParent()->notifyParent(params); } void LLFlatListView::setNoItemsCommentVisible(bool visible) const |