diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-02-15 13:46:49 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-02-15 13:46:49 +0200 |
| commit | 8ba5e0155ff0cbc2355ac4daf468d291fae84afa (patch) | |
| tree | 74c8e9a6f9ae76f3fd3414fde4d74f6a824aad0a /indra/llui/lltabcontainer.cpp | |
| parent | 75a060497c06d0143a0515f4d5665097da34a3e3 (diff) | |
| parent | 9fee359d1baf6e0046655cb8e4afabb8774754b1 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui/lltabcontainer.cpp')
| -rw-r--r-- | indra/llui/lltabcontainer.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp index 13340e7ded..e810b6fe8f 100644 --- a/indra/llui/lltabcontainer.cpp +++ b/indra/llui/lltabcontainer.cpp @@ -891,6 +891,10 @@ void LLTabContainer::update_images(LLTabTuple* tuple, TabParams params, LLTabCon void LLTabContainer::addTabPanel(const TabPanelParams& panel) { LLPanel* child = panel.panel(); + + llassert(child); + if (!child) return; + const std::string& label = panel.label.isProvided() ? panel.label() : panel.panel()->getLabel(); |