diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-03-02 17:36:22 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-03-02 17:36:22 -0600 |
| commit | 86580361bd633a6d25b01a87a309ec0a5178a86e (patch) | |
| tree | 0e97624b3e00a3644ce873bbc702335e71437189 /indra/llui/lltabcontainer.cpp | |
| parent | 5f9591535138d782f0f9666b39534149de0562a1 (diff) | |
| parent | 3c443a9287f5827316f96a14316f53e3919c57ac (diff) | |
Merge with viewer-2-0
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 |