diff options
| author | angela <angela@lindenlab.com> | 2010-03-03 13:52:14 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2010-03-03 13:52:14 +0800 |
| commit | 5777dfaae6268dffee83d7a457c024b1a89f81ff (patch) | |
| tree | 063583a1f9f7441356814be5891e6a7bcc61b9d4 /indra/llui | |
| parent | 70cc2d6974d034055e177a16c9fccc3b7b5e7c63 (diff) | |
| parent | 3c443a9287f5827316f96a14316f53e3919c57ac (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 |