diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-13 13:40:45 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-13 13:40:45 +0000 |
| commit | 10c9f17301e2dbacb0105b29d7214e67d5de8e85 (patch) | |
| tree | 3ed2d134435fe10a91973787489ec3be857809ab /indra | |
| parent | eb140739dbc26a0331b16b12081f1dae3847c9bb (diff) | |
CID-139
Checker: NULL_RETURNS
Function: LLPanelFaceSetTEFunctor::apply(LLViewerObject *, int)
File: /indra/newview/llpanelface.cpp
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpanelface.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index 4f450ce0a8..b50c6442e1 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -289,6 +289,9 @@ struct LLPanelFaceSetTEFunctor : public LLSelectedTEFunctor LLCheckBoxCtrl* checkFlipScaleS = mPanel->getChild<LLCheckBoxCtrl>("checkbox flip s"); LLCheckBoxCtrl* checkFlipScaleT = mPanel->getChild<LLCheckBoxCtrl>("checkbox flip t"); LLComboBox* comboTexGen = mPanel->getChild<LLComboBox>("combobox texgen"); + llassert(comboTexGen); + llassert(object); + if (ctrlTexScaleS) { valid = !ctrlTexScaleS->getTentative() || !checkFlipScaleS->getTentative(); @@ -299,7 +302,8 @@ struct LLPanelFaceSetTEFunctor : public LLSelectedTEFunctor { value = -value; } - if (comboTexGen->getCurrentIndex() == 1) + if (comboTexGen && + comboTexGen->getCurrentIndex() == 1) { value *= 0.5f; } @@ -317,7 +321,8 @@ struct LLPanelFaceSetTEFunctor : public LLSelectedTEFunctor { value = -value; } - if (comboTexGen->getCurrentIndex() == 1) + if (comboTexGen && + comboTexGen->getCurrentIndex() == 1) { value *= 0.5f; } |