diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-27 08:35:32 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-27 08:35:32 +0100 |
| commit | 72a94da05b66d25cd99963a4ea25e49b96431a72 (patch) | |
| tree | 02d266742a731f433105b8206eb233026acf2622 /indra/llui/llaccordionctrltab.cpp | |
| parent | 53fd70142fb7cdefffb7845b78d1b8f58cb46e09 (diff) | |
| parent | 611dfccfcb58878d24d65e50eca0f2364bb16ee5 (diff) | |
merge from viewer-trunk
Diffstat (limited to 'indra/llui/llaccordionctrltab.cpp')
| -rw-r--r-- | indra/llui/llaccordionctrltab.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llaccordionctrltab.cpp b/indra/llui/llaccordionctrltab.cpp index d389236642..3c706ce90e 100644 --- a/indra/llui/llaccordionctrltab.cpp +++ b/indra/llui/llaccordionctrltab.cpp @@ -554,7 +554,8 @@ S32 LLAccordionCtrlTab::notifyParent(const LLSD& info) } //LLAccordionCtrl should rearrange accodion tab if one of accordion change its size - getParent()->notifyParent(info); + if (getParent()) // A parent may not be set if tabs are added dynamically. + getParent()->notifyParent(info); return 1; } else if(str_action == "select_prev") |