diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-02 15:17:50 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-02 15:17:50 +0200 |
| commit | be1739c5d584495c3cd946fd3e156d4b2ac0a2b2 (patch) | |
| tree | 0eef774227e9627f9b3523a0ef79333d2a33ec8d /indra/llui | |
| parent | 9c8a8f388ab24c404f19602e156a76ad1a03b841 (diff) | |
| parent | d1d195ba904490c19faf2078560f49c3a6b16a18 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui')
| -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 |