diff options
| author | James Cook <james@lindenlab.com> | 2010-03-02 14:06:23 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-03-02 14:06:23 -0800 |
| commit | fe8d015851f74d375776791aa1adec204799037b (patch) | |
| tree | 644a0dfbd4cd750d69ccbf1a82fe1fc277842d2d /indra/newview/lllocationinputctrl.cpp | |
| parent | 822d042e0c04dba2cdaced8c81b50840972a7286 (diff) | |
| parent | 96da7000e34585d24b4b6946a30a3fb77d668f76 (diff) | |
Merge
Diffstat (limited to 'indra/newview/lllocationinputctrl.cpp')
| -rw-r--r-- | indra/newview/lllocationinputctrl.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp index f48c96190f..c66d067779 100644 --- a/indra/newview/lllocationinputctrl.cpp +++ b/indra/newview/lllocationinputctrl.cpp @@ -833,10 +833,13 @@ void LLLocationInputCtrl::refreshParcelIcons() mDamageText->setVisible(false); } - S32 left_pad, right_pad; - mTextEntry->getTextPadding(&left_pad, &right_pad); - right_pad = mTextEntry->getRect().mRight - x; - mTextEntry->setTextPadding(left_pad, right_pad); + if (mTextEntry) + { + S32 left_pad, right_pad; + mTextEntry->getTextPadding(&left_pad, &right_pad); + right_pad = mTextEntry->getRect().mRight - x; + mTextEntry->setTextPadding(left_pad, right_pad); + } } void LLLocationInputCtrl::refreshHealth() |