diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-02-13 19:05:21 -0500 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-02-13 19:05:21 -0500 |
| commit | 0b579ba112e5e4fa5b5348f1c865a3083b5e1175 (patch) | |
| tree | 599c506927d50f9a4a51c2f776e8fe954505e4d0 /indra/llui/lltabcontainer.cpp | |
| parent | 96f29d2ba0b66754b3b7b9e0f75deb198a84cb5f (diff) | |
| parent | 9fee359d1baf6e0046655cb8e4afabb8774754b1 (diff) | |
Automated merge from viewer-2-0 to normalize beta 3
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(); |