diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-03-02 11:06:43 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-03-02 11:06:43 -0800 |
| commit | 15af3f0e6acfccd2585c0a2a7be6e882ad71d256 (patch) | |
| tree | 59bb1dafa87c33aa06bb795c5ce3ee978f634baf /indra/llui | |
| parent | bfd1fd9936632bd3ed7724695d5c0ae87a707e3d (diff) | |
| parent | 06b81466869dc021f7138579580a1939fdfceb89 (diff) | |
Merge
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 |