diff options
| author | skolb <none@none> | 2010-03-08 14:54:54 -0800 |
|---|---|---|
| committer | skolb <none@none> | 2010-03-08 14:54:54 -0800 |
| commit | 78abe4f5ffb02e14cd98f049b8100d20a82f3b1c (patch) | |
| tree | 0c471654bd00737375e91f040d758716c82bffb2 /indra/llui/lltabcontainer.cpp | |
| parent | f39a87ef8384ede25a6597e678ac7609e9e64cc5 (diff) | |
| parent | 2aa9ecb60235c96a42f3719fab9dbc6ea1bf50db (diff) | |
Local merge
Diffstat (limited to 'indra/llui/lltabcontainer.cpp')
| -rw-r--r-- | indra/llui/lltabcontainer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp index 85ae13a889..30fc7babae 100644 --- a/indra/llui/lltabcontainer.cpp +++ b/indra/llui/lltabcontainer.cpp @@ -1649,7 +1649,7 @@ void LLTabContainer::reshapeTuple(LLTabTuple* tuple) if(mCustomIconCtrlUsed) { LLCustomButtonIconCtrl* button = dynamic_cast<LLCustomButtonIconCtrl*>(tuple->mButton); - LLIconCtrl* icon_ctrl = button->getIconCtrl(); + LLIconCtrl* icon_ctrl = button ? button->getIconCtrl() : NULL; image_overlay_width = icon_ctrl ? icon_ctrl->getRect().getWidth() : 0; } else |